summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Expand)AuthorAgeFilesLines
* Use RequestStore on MR show.json query count specuse-request-store-on-mr-controller-query-count-specOswaldo Ferreira2017-06-081-1/+6
* Allow group reporters to promote labelsallow-reporters-to-promote-group-labelsSean McGivern2017-06-081-3/+3
* 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
| | |/ | |/|
* | | 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
| | * | | Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-2614-375/+844
| | |\ \ \
| | * | | | Rename BuildsController to JobsControllerLin Jen-Shin2017-05-173-32/+32
| * | | | | Merge branch 'issue-edit-inline' into 'master'Filipa Lacerda2017-05-311-1/+1
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Merge branch 'master' into issue-edit-inlinePhil Hughes2017-05-305-25/+48
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | fixed move issue specsPhil Hughes2017-05-251-1/+1
| * | | | | Fix builds controller specs related to protected actionsGrzegorz Bizon2017-05-311-1/+5
| | |/ / / | |/| | |
| * | | | Merge branch 'rework-authorizations-performance' into 'master'Douwe Maan2017-05-293-7/+10
| |\ \ \ \
| | * | | | Hide nested group UI/API support for MySQLYorick Peterse2017-05-171-1/+1