summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-314-6/+4
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | * | | | | | | Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-2621-73/+201
| | |\ \ \ \ \ \ \
| | * | | | | | | | Add checks before redirect, remove status/traceLin Jen-Shin2017-05-242-8/+8
| | * | | | | | | | Use controllers to redirectLin Jen-Shin2017-05-232-0/+76
| | * | | | | | | | Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-182-0/+4
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Rename BuildsController to JobsControllerLin Jen-Shin2017-05-173-8/+8
| * | | | | | | | | | Merge branch 'issue-edit-inline' into 'master'Filipa Lacerda2017-05-312-5/+11
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| | * | | | | | | | | Merge branch 'master' into issue-edit-inlinePhil Hughes2017-05-3014-57/+117
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | |
| | * | | | | | | | | Warn before moving issue in inline edit formPhil Hughes2017-05-251-1/+1
| | * | | | | | | | | Merge branch 'master' into issue-edit-inlinePhil Hughes2017-05-2516-24/+94
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| | * | | | | | | | | Added move to project in issue inline edit formPhil Hughes2017-05-171-4/+1
| | * | | | | | | | | Merge branch 'master' into issue-edit-inlinePhil Hughes2017-05-162-3/+3
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Added inline issue edit form actionsPhil Hughes2017-05-151-1/+10
| * | | | | | | | | | | Remove some deprecated methodstc-improve-project-api-perfToon Claes2017-05-301-1/+1
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Introduce source to pipeline entitytrigger-sourceKamil Trzcinski2017-05-311-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'rework-authorizations-performance' into 'master'Douwe Maan2017-05-291-0/+2
|\ \ \ \ \ \ \ \ \ \
View Lorry Controller Status