summaryrefslogtreecommitdiff
path: root/app/controllers/projects
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'feature/custom-lfs' into 'master' Douwe Maan2017-03-131-1/+1
|\
| * Do not show LFS object when LFS is disabledChristopher Bartz2017-03-131-1/+1
* | Merge branch 'handle-failure-when-deleting-tags' into 'master' Douwe Maan2017-03-131-4/+18
|\ \
| * | Display error message when deleting tag in web UI failshandle-failure-when-deleting-tagsAdam Niedzielski2017-03-131-4/+18
* | | Merge branch '25515-delegate-single-discussion-to-new-issue' into 'master' Douwe Maan2017-03-131-14/+23
|\ \ \ | |_|/ |/| |
| * | Check `service.discussion_to_resolve_id` to decide content of flashBob Van Landuyt2017-03-131-1/+1
| * | Rename variableBob Van Landuyt2017-03-131-4/+3
| * | Separate flash messages for resolving one or multiple discussionsBob Van Landuyt2017-03-131-3/+6
| * | Add a flash messages when an issue resolving discussions is createdBob Van Landuyt2017-03-131-1/+7
| * | Move functionality for resolving discussions into a concernBob Van Landuyt2017-03-131-3/+2
| * | Always require MR-iid for resolving discussionsBob Van Landuyt2017-03-131-24/+12
| * | Delegate a single discussion to a new issueBob Van Landuyt2017-03-131-5/+19
| |/
* | New file from interface on existing branchJacopo2017-03-132-6/+14
|/
* Prevent more than one issue tracker to be active for the same projectLuis Del Giudice2017-03-101-1/+2
* Show members of parent groups on project members pagedz-nested-groups-membersDmitriy Zaporozhets2017-03-091-33/+4
* Merge branch 'master' into orderable-issuesDouwe Maan2017-03-075-61/+129
|\
| * Merge branch '26732-combine-deploy-keys-and-push-rules-and-mirror-repository-...Sean McGivern2017-03-073-52/+64
| |\
| | * Merge branch 'master' into 26732-combine-deploy-keys-and-push-rules-and-mirro...26732-combine-deploy-keys-and-push-rules-and-mirror-repository-and-protect-branches-settings-pagesPhil Hughes2017-03-072-9/+5
| | |\
| | * | Renamed the redirect_request concern to repository_settings_redirectJose Ivan Vargas2017-03-062-2/+2
| | * | Fixed repository_controller_specJose Ivan Vargas2017-03-061-4/+7
| | * | Added delegations to comply with the new rubocop rulesJose Ivan Vargas2017-03-061-2/+21
| | * | Added tests for the repository_controller and repository_helperJose Ivan Vargas2017-03-063-21/+19
| | * | Added access spec testsJose Ivan Vargas2017-03-062-18/+1
| | * | Introduced the deploy keys presenterGrzegorz Bizon2017-03-061-18/+3
| | * | Fixed tests, changed dispatcher routing to the 'repository:show'Jose Ivan Vargas2017-03-062-25/+8
| | * | Created the gear settings entry and created a way to initialize both sections...Jose Ivan Vargas2017-03-063-10/+42
| | * | Added repository controller and route for the settings namespaceJose Ivan Vargas2017-03-061-0/+9
| * | | Added Prometheus Service and Prometheus graphsKamil Trzciński2017-03-071-1/+14
| * | | Improve pipeline triggers UIKamil Trzciński2017-03-071-8/+51
| | |/ | |/|
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into orderable-issuesValery Sizov2017-03-072-7/+3
|\ \ \ | |/ /
| * | Merge branch 'protected-branch-dropdown-headings' into 'master' Sean McGivern2017-03-071-2/+2
| |\ \
| | * | Backport protected branches Ruby change from EEprotected-branch-dropdown-headingsPhil Hughes2017-03-061-2/+2
| | |/
| * | Use native unicode emojisEric Eastwood2017-03-061-5/+1
| |/
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into orderable-issuesValery Sizov2017-03-062-2/+7
|\ \ | |/
| * Merge branch '28898-fix-search-branches-in-cherry-picking' into 'master' Sean McGivern2017-03-061-1/+1
| |\
| | * Fix json response in branches controllerGeorge Andrinopoulos2017-03-061-1/+1
| * | Merge branch 'etag-notes-polling' into 'master' Sean McGivern2017-03-061-1/+6
| |\ \
| | * | Remove query parameters from notes polling endpoint to make caching easierAdam Niedzielski2017-03-011-1/+6
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into orderable-issuesValery Sizov2017-03-036-51/+75
|\ \ \ \ | |/ / /
| * | | Merge branch 'dm-fix-cherry-pick' into 'master' Robert Speicher2017-03-032-15/+23
| |\ \ \
| | * | | Fix cherry-picking or reverting through an MRDouwe Maan2017-03-022-15/+23
| * | | | Merge branch '28010-mr-merge-button-default-to-danger' into 'master' Alfredo Sumaran2017-03-031-1/+4
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Default to subtle MR mege button until CI status is available28010-mr-merge-button-default-to-dangerEric Eastwood2017-03-021-1/+4
| * | | | Cleaning up navigational order - ProjectKushal Pandya2017-03-022-12/+30
| |/ / /
| * | | Merge branch 'fix/mwbs-to-mwps' into 'master' Douwe Maan2017-03-011-12/+12
| |\ \ \
| | * | | Update occurrences of MWBS to MWPSfix/mwbs-to-mwpsJames Lopez2017-03-011-12/+12
| | | |/ | | |/|
| * | | Merge branch 'fix/gb/improve-merge-request-pipelines-api' into 'master' Kamil Trzciński2017-03-011-1/+3
| |\ \ \
| | * | | Fix rubocop errorfix/gb/improve-merge-request-pipelines-apiFilipa Lacerda2017-02-281-1/+2
| | * | | Reinstate new merge request pipelines hash in APIGrzegorz Bizon2017-02-281-2/+3
| | |/ /
| * | | Merge branch 'custom-empty-exception-class-cop' into 'master' Robert Speicher2017-03-011-1/+1
| |\ \ \ | | |_|/ | |/| |