summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Add a rubocop rule to check if a method 'redirect_to' is used without explici...31840-add-a-rubocop-that-forbids-redirect_to-inside-a-controller-destroy-action-without-an-explicit-statusblackst0ne2017-06-0743-52/+73
* Limit non-administrators to adding 100 members at a time to groups and projectsNick Thomas2017-06-062-6/+8
* Merge branch 'pull-mirror-overhaul-ce-backport' into 'master'Douwe Maan2017-06-051-8/+1
|\
| * backports changed import logic from pull mirroring feature into CETiago Botelho2017-06-051-8/+1
* | Merge branch 'mk-fix-git-over-http-rejections' into 'master'Douwe Maan2017-06-053-78/+25
|\ \
| * | Refactor to let GitAccess errors bubble upMichael Kozono2017-06-051-35/+14
| * | Refactor to let `GitAccess` check protocol configMichael Kozono2017-06-051-10/+0
| * | Move CI access logic into GitAccessMichael Kozono2017-06-053-25/+15
| * | RefactorMichael Kozono2017-06-051-4/+0
| * | Check disabled commands in GitAccess insteadMichael Kozono2017-06-051-4/+0
| * | Render GitAccess message if authorizedMichael Kozono2017-06-051-5/+1
* | | Merge branch '28694-hard-delete-user-from-admin-panel' into 'master'Douwe Maan2017-06-052-2/+2
|\ \ \
| * | | Support hard deletion in Admin::UsersController#destroyNick Thomas2017-06-051-1/+1
| * | | Refactor the DeleteUserWorkerNick Thomas2017-06-051-1/+1
| |/ /
* | | Merge branch 'jej-backport-protected-tag-ee-role-refactorings' into 'master'Tim Zallmann2017-06-053-3/+9
|\ \ \ | |/ / |/| |
| * | Backport EE refactorings for Protected Tag EE-only functionalityjej-backport-protected-tag-ee-role-refactoringsJames Edwards-Jones2017-05-313-3/+9
* | | Merge branch 'fix-realtime-edited-text-for-issues-9-3' into 'master'Phil Hughes2017-06-051-3/+10
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/master' into fix-realtime-edited-text-fo...Luke "Jared" Bennett2017-06-0216-148/+244
| |\ \ \
| * | | | Port fix-realtime-edited-text-for-issues 9-2-stable fix to master.Luke "Jared" Bennett2017-05-311-3/+10
| | |/ / | |/| |
* | | | Merge branch 'zj-job-view-goes-real-time' into 'master'Kamil Trzciński2017-06-051-0/+11
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/master' into zj-job-view-goes-real-timeKamil Trzcinski2017-06-029-23/+37
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into zj-job-view-goes-real-timeZ.J. van de Weg2017-06-011-1/+1
| |\ \ \ \ \
| * | | | | | Rename build to jobZ.J. van de Weg2017-06-011-1/+1
| * | | | | | Initial implementation for real time job viewZ.J. van de Weg2017-05-311-0/+11
* | | | | | | Merge branch '30469-convdev-index' into 'master'Sean McGivern2017-06-051-0/+5
|\ \ \ \ \ \ \
| * | | | | | | Add Conversational Development Index page to admin panelTaurie Davis, Simon Knox and Adam Niedzielski2017-06-011-0/+5
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'mabes/gitlab-ce-bypass-auto-login' into 'master'Douwe Maan2017-06-021-1/+5
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Allow manual bypass of auto_sign_in_with_providermabes/gitlab-ce-bypass-auto-loginMaxime Besson2017-06-021-1/+5
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'jouve/gitlab-ce-admin_keys' into 'master'Rémy Coutable2017-06-021-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | redirect to keys index instead of user index after a key is deletedjouve/gitlab-ce-admin_keysCyril Jouve2017-06-011-2/+2
| |/ / / /
* | | | | Merge branch '31511-jira-settings' into 'master'Sean McGivern2017-06-021-14/+25
|\ \ \ \ \
| * | | | | Address review comments31511-jira-settingsJarka Kadlecova2017-06-021-2/+2
| * | | | | Add feature tests for improved JIRA settingsJarka Kadlecova2017-06-011-7/+12
| * | | | | simplify test&save actions when setting a service integrationJarka Kadlecova2017-06-011-13/+19
| | |_|/ / | |/| | |
* | | | | Merge branch 'zj-realtime-env-list' into 'master'Kamil Trzciński2017-06-011-0/+2
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into zj-realtime-env-listZ.J. van de Weg2017-06-0122-184/+326
| |\ \ \ \ \ | | |/ / / /
| * | | | | Merge branch 'master' into zj-realtime-env-listZ.J. van de Weg2017-05-254-8/+35
| |\ \ \ \ \
| * | | | | | Test etag caching router and incorporate reviewZ.J. van de Weg2017-05-241-1/+1
| * | | | | | Use etag caching for environments JSONZ.J. van de Weg2017-05-221-0/+2
* | | | | | | Merge branch '24196-protected-variables' into 'master'Kamil Trzciński2017-06-011-1/+2
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Merge branch 'master' into '24196-protected-variables'Kamil Trzciński2017-06-011-1/+1
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | Merge remote-tracking branch 'upstream/master' into 24196-protected-variablesLin Jen-Shin2017-06-018-126/+208
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Merge remote-tracking branch 'upstream/master' into 24196-protected-variablesLin Jen-Shin2017-05-312-1/+3
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'master' into '24196-protected-variables'Lin Jen-Shin (godfat)2017-05-2614-62/+146
| |\ \ \ \ \ \
| * | | | | | | Frontend implementation, tests, and changelogLin Jen-Shin2017-05-251-1/+2
* | | | | | | | Merge branch 'dm-collapsed-blob' into 'master'Sean McGivern2017-06-015-6/+6
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Consistent diff and blob size limit namesDouwe Maan2017-05-295-6/+6
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'master' into 'trigger-source'Grzegorz Bizon2017-05-318-126/+208
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge branch 'rename-builds-controller' into 'master'Kamil Trzciński2017-05-315-120/+196
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-311-1/+1
| | |\ \ \ \ \ \
View Lorry Controller Status