summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* All CI offline migrationsKamil Trzciński2017-03-171-1/+0
* Add ability to disable Merge Request URL on pushAlex Sanford2017-03-171-0/+1
* Merge branch 'fix-slow-queries-for-branches-index' into 'master' Douwe Maan2017-03-162-3/+11
|\
| * removes n+1 query from tags and branches indexesfix-slow-queries-for-branches-indexTiago Botelho2017-03-162-3/+11
* | Merge branch 'add-blob-copy-button' into 'master' Robert Speicher2017-03-161-1/+4
|\ \ | |/ |/|
| * Fix specDouwe Maan2017-03-161-1/+4
* | Merge branch '27376-cache-default-branch-pipeline-on-project' into 'master' Yorick Peterse2017-03-162-4/+12
|\ \
| * | Eager load route & namespace in `Explore::ProjectsController`Bob Van Landuyt2017-03-161-3/+11
| * | Eager load route for project & namespaceBob Van Landuyt2017-03-161-1/+1
* | | Merge branch '27114-add-undo-mark-all-as-done-to-todos' into 'master' Filipa Lacerda2017-03-161-2/+8
|\ \ \ | |/ / |/| |
| * | Add 'Undo mark all as done' to TodosJacopo2017-03-161-2/+8
* | | Merge branch 'fix-project-without-repo-and-wiki' into 'master' Rémy Coutable2017-03-161-2/+3
|\ \ \ | |_|/ |/| |
| * | Fix projects without repo and wikiLin Jen-Shin2017-03-151-2/+3
* | | Revert "Merge branch 'option-to-be-notified-of-own-activity' into 'master'Stan Hu2017-03-151-1/+1
* | | Display full project name with namespace upon deletionMark Fletcher2017-03-151-1/+1
|/ /
* | Merge branch '29389-fix-already-initialized-constants' into 'master' Robert Speicher2017-03-141-2/+0
|\ \ | |/ |/|
| * Remove explicit `require` calls, and use `require_dependency` when needed29389-fix-already-initialized-constantsRémy Coutable2017-03-131-2/+0
* | Merge branch 'adam-count-badges-group-dashboard-milestones' into 'master' Sean McGivern2017-03-142-0/+2
|\ \
| * | Add count badges to both dashboard and group milestonesadam-count-badges-group-dashboard-milestonesAlex Braha Stoll2017-03-102-0/+2
* | | 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
* | | | Merge branch '24501-new-file-existing-branch' into 'master'Sean McGivern2017-03-132-6/+14
|\ \ \ \ | |_|/ / |/| | |
| * | | New file from interface on existing branchJacopo2017-03-132-6/+14
| |/ /
* | | Merge branch 'refactor/global-permissions-for-internal-users' into 'master' Sean McGivern2017-03-134-12/+18
|\ \ \ | |/ / |/| |
| * | get the logic right :Xhttp://jneen.net/2017-03-091-1/+1
| * | consolidate the error handling for #impersonatehttp://jneen.net/2017-03-091-9/+12
| * | protect internal users from impersonationhttp://jneen.net/2017-03-091-0/+4
| * | use the policy stack to protect loginshttp://jneen.net/2017-03-092-5/+4
| * | use a magic default :global symbol instead of nilhttp://jneen.net/2017-03-092-2/+2
| |/
* | Merge branch 'adam-prevent-two-issue-trackers' into 'master' Sean McGivern2017-03-101-1/+2
|\ \
| * | Prevent more than one issue tracker to be active for the same projectLuis Del Giudice2017-03-101-1/+2
| |/
* | Fix autocomplete in EE when permissions are sent29316-can-t-select-a-mirror-userSean McGivern2017-03-101-2/+1
|/
* 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-0711-110/+205
|\
| * Fix access token specsfix-specs-for-access-tokensSean McGivern2017-03-071-1/+1
| * Merge branch '26732-combine-deploy-keys-and-push-rules-and-mirror-repository-...Sean McGivern2017-03-074-52/+71
| |\
| | * 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-076-17/+22
| | |\
| | * | Renamed the redirect_request concern to repository_settings_redirectJose Ivan Vargas2017-03-063-3/+3
| | * | 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
View Lorry Controller Status