summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Expand)AuthorAgeFilesLines
* Revert 'New file from interface on existing branch'Douwe Maan2017-06-161-14/+0
* Merge branch 'sh-recaptcha-fix-try2' into 'master'Sean McGivern2017-06-161-0/+1
* Merge branch 'fix-external-ci-services' into 'master'Grzegorz Bizon2017-06-161-7/+30
* Merge branch 'master-security-update' into 'master'Regis Boudinot2017-06-081-10/+20
|\
| * Merge branch 'dz-restrict-autocomplete' into 'security-9-1'DJ Mountney2017-06-081-10/+20
* | Merge branch 'master' into 25426-group-dashboard-ui25426-group-dashboard-uiAlfredo Sumaran2017-06-081-3/+3
|\ \ | |/
| * Allow group reporters to promote labelsallow-reporters-to-promote-group-labelsSean McGivern2017-06-081-3/+3
* | Merge branch 'master' into 25426-group-dashboard-uiAlfredo Sumaran2017-06-0715-123/+327
|\ \ | |/
| * Sync email address from specified omniauth providerRobin Bobbitt2017-06-071-0/+31
| * Merge branch 'expand-backlog-closed-lists-issue-boards' into 'master'Douwe Maan2017-06-071-1/+1
| |\
| | * spec updatesPhil Hughes2017-05-311-1/+1
| * | Merge branch 'instrument-infra' into 'master'Grzegorz Bizon2017-06-072-39/+70
| |\ \
| | * | Do not cleanup temp directory as this apparently causes silent rspec failures...Pawel Chojnacki2017-06-071-8/+2
| | * | Add prometheus text formatterPawel Chojnacki2017-06-021-6/+6
| | * | Move Prometheus presentation logic to PrometheusTextPawel Chojnacki2017-06-021-2/+2
| | * | Mark migration as requiring no downtimePawel Chojnacki2017-06-021-0/+5
| | * | Move most of MetricsController logic to MetricsServicePawel Chojnacki2017-06-021-2/+3
| | * | move check if metrics are enabled to before actionPawel Chojnacki2017-06-021-0/+10
| | * | Correctly handle temporary folder for testing multiproces metricsPawel Chojnacki2017-06-021-0/+9
| | * | Split metrics from health controller into metrics controllerPawel Chojnacki2017-06-022-39/+51
| * | | Merge branch '12910-snippets-description' into 'master'Phil Hughes2017-06-073-2/+84
| |\ \ \
| | * | | Support uploads for newly created personal snippets12910-snippets-descriptionJarka Kadlecova2017-06-071-0/+34
| | * | | Support descriptions for snippetsJarka Kadlecova2017-05-312-2/+50
| | | |/ | | |/|
| * | | Merge branch '27148-limit-bulk-create-memberships' into 'master'Douwe Maan2017-06-062-3/+12
| |\ \ \
| | * | | Limit non-administrators to adding 100 members at a time to groups and projectsNick Thomas2017-06-062-3/+12
| * | | | redesign caching of application settingsPaul Charlton2017-06-061-1/+1
| |/ / /
| * | | Support hard deletion in Admin::UsersController#destroyNick Thomas2017-06-051-2/+13
| * | | Refactor the DeleteUserWorkerNick Thomas2017-06-051-1/+1
| * | | Merge branch 'zj-job-view-goes-real-time' into 'master'Kamil Trzciński2017-06-051-11/+34
| |\ \ \
| | * | | Fix test failuresKamil Trzcinski2017-06-031-2/+2
| | * | | Merge remote-tracking branch 'origin/master' into zj-job-view-goes-real-timeKamil Trzcinski2017-06-023-64/+55
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Add user to BuildDetailsEntityZ.J. van de Weg2017-06-021-1/+2
| | * | | Incorporate reviewZ.J. van de Weg2017-05-311-1/+1
| | * | | Initial implementation for real time job viewZ.J. van de Weg2017-05-311-11/+33
| * | | | Merge branch 'mabes/gitlab-ce-bypass-auto-login' into 'master'Douwe Maan2017-06-021-0/+31
| |\ \ \ \
| | * | | | Allow manual bypass of auto_sign_in_with_providermabes/gitlab-ce-bypass-auto-loginMaxime Besson2017-06-021-0/+31
| | | |/ / | | |/| |
| * | | | Merge branch '33139-lint-our-factories' into 'master'Grzegorz Bizon2017-06-021-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Lint our factories creation in addition to their build33139-lint-our-factoriesRémy Coutable2017-06-021-1/+1
| | | |/ | | |/|
| * | | Skip loading application settings from the database when migrations are pendingNick Thomas2017-06-021-1/+1
| * | | Merge branch '31511-jira-settings' into 'master'Sean McGivern2017-06-021-63/+49
| |\ \ \
| | * | | Address MR commentsJarka Kadlecova2017-06-011-3/+0
| | * | | fix failing specsJarka Kadlecova2017-06-011-2/+2
| | * | | simplify test&save actions when setting a service integrationJarka Kadlecova2017-06-011-63/+52
| | | |/ | | |/|
* | | | Fix failing specAlfredo Sumaran2017-06-071-1/+1
* | | | Add json support to group members leave action in controllerDmitriy Zaporozhets2017-06-061-0/+7
|/ / /
* | | Merge branch 'master' into zj-realtime-env-listZ.J. van de Weg2017-06-019-60/+87
|\ \ \ | |/ /
| * | Merge branch 'rename-builds-controller' into 'master'Kamil Trzciński2017-05-313-33/+33
| |\ \
| | * \ Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-311-1/+5
| | |\ \
| | * \ \ Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-313-7/+24
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Use - as the prefix so we don't conflict with namespacesLin Jen-Shin2017-05-261-2/+2
View Lorry Controller Status