summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ee-1439-read-only-user' into 'master' Douwe Maan2017-02-078-45/+85
|\ | | | | | | | | Backport changes from gitlab-org/gitlab-ee!998 See merge request !8984
| * List all groups/projects for admins on explore pagesDouwe Maan2017-02-061-1/+1
| |
| * Fix indentationee-1439-read-only-userDouwe Maan2017-02-061-4/+4
| |
| * More backportDouwe Maan2017-02-061-4/+13
| |
| * Backport of the frontend view, including testsJose Ivan Vargas2017-02-063-7/+28
| |
| * Backport UI changes from gitlab-org/gitlab-ee!998Timothy Andrew2017-02-062-22/+23
| |
| * Backport changes from gitlab-org/gitlab-ee!998Timothy Andrew2017-02-063-21/+30
| | | | | | | | | | | | Some changes in EE for the auditor user feature need to be backported to CE to avoid merge conflicts. This commit encapsulates all these backports.
* | Merge branch '27343-autocomplete-post-to-wrong-url-when-not-hosting-in-root' ↵Filipa Lacerda2017-02-071-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Fix filtered search user autocomplete for gitlab instances that are hosted on a subdirectory Closes #27343 See merge request !8891
| * | Fix filtered search user autocomplete for gitlab instances that are hosted ↵27343-autocomplete-post-to-wrong-url-when-not-hosting-in-rootClement Ho2017-02-061-1/+1
| | | | | | | | | | | | on a subdirectory
* | | Merge branch 'commit-description-border' into 'master' Alfredo Sumaran2017-02-061-1/+0
|\ \ \ | | | | | | | | | | | | | | | | Remove lighter colored commit description border See merge request !9005
| * | | Remove lighter colored commit description bordercommit-description-borderAnnabel Dunstone Gray2017-02-061-1/+0
| |/ /
* | | Merge branch 'fe-commit-mr-pipelines' into 'master' Fatih Acet2017-02-0632-256/+672
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use vue.js Pipelines table in commit and merge request view Closes #27141 See merge request !8844
| * | | Use webpack to require filesFilipa Lacerda2017-02-0511-44/+42
| | | | | | | | | | | | | | | | Changes after review
| * | | Use webpack to require filesFilipa Lacerda2017-02-055-15/+15
| | | |
| * | | Move interceptor to common interceptors filesFilipa Lacerda2017-02-051-0/+8
| | | |
| * | | Use webpackFilipa Lacerda2017-02-054-74/+55
| | | |
| * | | Move repeated function to utilitiesFilipa Lacerda2017-02-051-0/+8
| | | |
| * | | Fix broken path to fileFilipa Lacerda2017-02-051-1/+1
| | | | | | | | | | | | | | | | Fix broken path to file
| * | | Merge branch 'master' into fe-commit-mr-pipelinesFilipa Lacerda2017-02-04108-302/+303
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (76 commits) fix failing test fix Vue warnings for missing element [ci skip] UX Guide: Button placement in groups Change window size before visiting page, to get correct scroll position Fix slash commands spec error Move project services to new location under Integrations Move webhooks to new a location under Integrations Fixed redirection from http://someproject.git to http://someproject consistently use single quotes allow application.js to require other scripts which start with application* DRY with Gitlab.config.webpack.dev_server references disable webpack proxy in rspec environment due to conflicts with webmock gem remove changes to Procfile configure webpack dev server port via environment variable add rack middleware to proxy webpack dev server remove dev-server config from development environment Document that the retro and kickoff notes are public add CHAGELOG.md entry for webpack branch fix failing rspec build fix test failure for merge request widget ...
| * | | Merge branch 'master' into fe-commit-mr-pipelinesFilipa Lacerda2017-02-0380-176/+1231
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (65 commits) Fixed eslint test failure Fixed adding to list bug Remove unnecessary queries for .atom and .json in Dashboard::ProjectsController#index Fixed modal lists dropdown not updating when list is deleted Fixed remove btn error after creating new issue in list Removed duplicated test Removed Masonry, instead uses groups of data Uses mixins for repeated functions Fixed up specs Props use objects with required & type values Removes labels instead of closing issue when clicking remove button Fixed JS lint errors Fixed issue card spec Added webkit CSS properties Fixed bug with empty state showing after search Fixed users href path being incorrect Fixed bug where 2 un-selected issues would stay on selected tab Fixed DB schema Changed how components are added in objects Added remove button Add optional id property to the issue schema Fixed issue link href ...
| * | | | Fix broken testsFilipa Lacerda2017-02-031-0/+1
| | | | |
| * | | | Resolve conflict after mergeFilipa Lacerda2017-02-0342-90/+92
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into fe-commit-mr-pipelinesFilipa Lacerda2017-02-0320-42/+97
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Backport changes from EE squash replace `find_with_namespace` with `find_by_full_path` PlantUML support for Markdown Update api docs and minor changes Force new password after password reset via API Fixed protected branches dropdown Fixed up tests Fixed the active branch selected indicator Changed how the data is returned - we only care about the branch/tag name Uses take rather than Kaminari Use cloneNode instead of createElement Improved ref switcher dropdown performance
| * | | | | | Only load pipelines vue component when there are pipelines.Filipa Lacerda2017-02-034-33/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Move Empty state to vue component
| * | | | | | Add time ago auto-update to the 2 newest tablesFilipa Lacerda2017-02-035-8/+42
| | | | | | |
| * | | | | | Serialize pipelines in the new merge request actionGrzegorz Bizon2017-02-031-1/+8
| | | | | | |
| * | | | | | Fix syntax error in the new merge request viewGrzegorz Bizon2017-02-031-1/+1
| | | | | | |
| * | | | | | Moves pagination to shared folderFilipa Lacerda2017-02-0315-173/+202
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document and remove unused code Declare components in a consistent way; Use " instead of ' to improve consistency; Update documentation; Fix commit author verification to match the use cases; Adds tests for the added components Fix paths in pagination spec Adds tests to pipelines table used in merge requests and commits Use same resource interceptor Fix eslint error
| * | | | | | Use new vue js pipelines table to render in merge request viewFilipa Lacerda2017-02-0317-223/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate data-toggle attributes. Reuse the same pipeline table Remove unneeded required resources Remove unused file; Fix mr pipelines loading Updates documentation
| * | | | | | Transform vue_pipelines index into a non-dependent table component.Filipa Lacerda2017-02-037-312/+306
| | | | | | |
| * | | | | | Use same folder structure in spec for vue shared resourcesFilipa Lacerda2017-02-034-1/+1
| | | | | | |
| * | | | | | Use single source of truth for vue_resource_interceptorFilipa Lacerda2017-02-034-13/+6
| | | | | | |
| * | | | | | First iterationFilipa Lacerda2017-02-0310-18/+476
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create shared folder for vue common files Update paths Second iteration - refactor main component to be 100% reusable between the 3 tables
* | | | | | | Merge branch 'fix-deleting-project-again' into 'master' Douwe Maan2017-02-061-4/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip or retain project while deleting the project: Closes #15005 See merge request !8960
| * | | | | | | Skip or retain project while deleting the project:Lin Jen-Shin2017-02-031-4/+17
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Skip Ci::Build#update_project_statistics whenever there's no project (i.e. we're deleting the project!) * Retain the unscoped_project before deleting the build, so that we could use the data to delete the artifacts. Note that carrierwave uses `after_commit` for this, so we need to retain it in the memory. Closes #15005
* | | | | | | Don't delete assigned MRs/issues when user is deletedDouwe Maan2017-02-061-2/+3
| | | | | | |
* | | | | | | Merge branch '27240-make-progress-bars-consistent' into 'master' Annabel Dunstone Gray2017-02-061-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 27240 Make progress bars consistent Closes #27240 See merge request !8913
| * | | | | | | 27240 Make progress bars consistent27240-make-progress-bars-consistenttauriedavis2017-02-031-0/+2
| | | | | | | |
* | | | | | | | Merge branch 'issues-modal-filters' into 'master' Fatih Acet2017-02-0613-25/+436
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue filters in boards modal Closes #26205 See merge request !8903
| * | | | | | | | Fixed eslintPhil Hughes2017-02-062-4/+10
| | | | | | | | |
| * | | | | | | | Merge branch 'master' into issues-modal-filtersPhil Hughes2017-02-06114-555/+558
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Fixed milestone select failing testsPhil Hughes2017-02-031-1/+1
| | | | | | | | |
| * | | | | | | | Fixed eslint errorsPhil Hughes2017-02-036-8/+12
| | | | | | | | |
| * | | | | | | | Show empty state if filter returns empty resultsPhil Hughes2017-02-033-1/+25
| | | | | | | | |
| * | | | | | | | Resets modal filters when closingPhil Hughes2017-02-033-6/+16
| | | | | | | | |
| * | | | | | | | Added tests for modal filtersPhil Hughes2017-02-031-1/+1
| | | | | | | | |
| * | | | | | | | Passes through the correct endpointsPhil Hughes2017-02-036-6/+48
| | | | | | | | |
| * | | | | | | | Responsive styling fixes for the filtersPhil Hughes2017-02-031-2/+14
| | | | | | | | |
| * | | | | | | | Added all filtersPhil Hughes2017-02-0310-77/+198
| | | | | | | | |
| * | | | | | | | Added user filter componentPhil Hughes2017-02-032-80/+104
| | | | | | | | |
View Lorry Controller Status