summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '35453-pending-delete-projects-error-in-admin-dashboard-fix' int...Sean McGivern2017-07-261-0/+21
|\
| * Fixes 500 error caused by pending delete projects in admin dashboard35453-pending-delete-projects-error-in-admin-dashboard-fixTiago Botelho2017-07-251-0/+21
* | Merge branch '30634-protected-pipeline' into 'master'Kamil Trzciński2017-07-252-3/+8
|\ \
| * \ Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-207-14/+126
| |\ \
| * | | Instead of adding master, stub_not_protect_default_branchLin Jen-Shin2017-07-182-6/+11
| * | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-1734-207/+866
| |\ \ \
| * | | | Update tests due to permission changesLin Jen-Shin2017-07-042-9/+9
* | | | | Merge branch 'dz-update-shoulda' into 'master'Rémy Coutable2017-07-253-5/+5
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Remove unnecessary set_flash.now from controller specsDmitriy Zaporozhets2017-07-243-5/+5
* | | | | Associate Issues tab only with internal issues trackerJarka Kadlecova2017-07-241-19/+40
|/ / / /
* | | | Merge branch 'zj-pipeline-badge-improvements' into 'master'Grzegorz Bizon2017-07-221-0/+28
|\ \ \ \
| * | | | Rename build to pipeline for status badgesZ.J. van de Weg2017-07-211-0/+28
* | | | | Merge branch '34549-extract-devise-mappings-into-helper' into 'master'Rémy Coutable2017-07-211-3/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Extract "@request.env['devise.mapping'] = Devise.mappings[:user]" to a test h...Jacopo2017-07-201-3/+5
* | | | | Wrong data type when testing webhooksAlexander Randa2017-07-201-0/+21
| |_|_|/ |/| | |
* | | | Merge branch 'fix/gb/fix-container-registry-tag-routing' into 'master'Kamil Trzciński2017-07-201-0/+48
|\ \ \ \
| * | | | Fix docker tag reference routing constraintsGrzegorz Bizon2017-07-191-0/+48
| | |_|/ | |/| |
* | | | Merge branch '33303-404-for-unauthorized-project' into 'security-9-3'Sean McGivern2017-07-191-0/+30
* | | | Merge branch '33359-pers-snippet-files-location' into 'security-9-3'Sean McGivern2017-07-192-6/+6
* | | | Merge branch '34930-fix-edited-by' into 'master'Sean McGivern2017-07-191-0/+30
|\ \ \ \
| * | | | Use Ghost user when edited_by, merged_by deleted34930-fix-edited-byJarka Kadlecova2017-07-191-0/+30
| |/ / /
* | | | Merge branch 'authentiq-updates' into 'master'Rémy Coutable2017-07-191-1/+1
|\ \ \ \
| * | | | Added authentiq provider to tests and updated documentation, gem and config f...Alexandros Keramidas2017-07-181-1/+1
| | |/ / | |/| |
* | | | Merge branch 'issue_35132' into 'master'Sean McGivern2017-07-191-6/+10
|\ \ \ \
| * | | | Fix external issue trackers redirectissue_35132Felipe Artur2017-07-181-6/+10
| | |/ / | |/| |
* | | | Update Prometheus gem to version that explicitly calls `munmap`Paweł Chojnacki2017-07-191-1/+1
|/ / /
* | | Merge branch 'bjk/metric_names' into 'master'Douwe Maan2017-07-141-8/+8
|\ \ \
| * | | Add unit to latency metrics.Ben Kochie2017-07-121-8/+8
* | | | Merge branch 'fix-exact-matches-of-username-and-email-on-top-of-the-user-sear...Sean McGivern2017-07-141-0/+15
|\ \ \ \
| * | | | Fixes the user order being overriden in the autocomplete controllerfix-exact-matches-of-username-and-email-on-top-of-the-user-searchTiago Botelho2017-07-141-0/+15
* | | | | Update Pipeline's badge count in Merge Request and Commits view to match real...Filipa Lacerda2017-07-142-2/+4
* | | | | Merge branch 'fix/gb/recover-from-renaming-project-with-container-images' int...Sean McGivern2017-07-141-11/+30
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove one assertion from projects controller specsGrzegorz Bizon2017-07-141-3/+2
| * | | | Fix rubocop offense in projects controller specsGrzegorz Bizon2017-07-141-1/+1
| * | | | Recover from renaming project that has container imagesGrzegorz Bizon2017-07-131-11/+31
| |/ / /
* | | | Merge branch 'fixes-for-internal-auth-disabled' into 'master'Sean McGivern2017-07-142-0/+38
|\ \ \ \ | |/ / / |/| | |
| * | | Fixes needed when GitLab sign-in is not enabledRobin Bobbitt2017-07-132-0/+38
| |/ /
* | | Merge branch '33949-remove-healthcheck-access-token' into 'master'Sean McGivern2017-07-113-49/+155
|\ \ \
| * | | Differentiate shared test context using options hash instead of subject.33949-remove-healthcheck-access-tokenPawel Chojnacki2017-07-102-5/+7
| * | | Add tests for token auth.Pawel Chojnacki2017-07-062-16/+59
| * | | Add spaces between test phasesPawel Chojnacki2017-07-052-2/+19
| * | | Finish refactring processed configuraiton, and add test validating ip range m...Pawel Chojnacki2017-07-051-7/+21
| * | | Bring back healthcheck token access to monitoring resources, but mark this as...Pawel Chojnacki2017-07-051-0/+16
| * | | Remove the need to use health check tokenPawel Chojnacki2017-07-053-36/+50
| | |/ | |/|
* | | Support multiple Redis instances based on queue typePaul Charlton2017-07-113-3/+31
| |/ |/|
* | Merge branch 'feature/intermediate/32568-adding-variables-to-pipelines-schedu...Kamil Trzciński2017-07-071-36/+294
|\ \
| * \ Merge from master(Fix conflicts)Shinya Maeda2017-07-073-3/+78
| |\ \
| * \ \ merge from masterShinya Maeda2017-07-0719-65/+55
| |\ \ \
| * | | | Remove validates :key, uniqueness due to new validator covers the casefeature/intermediate/32568-adding-variables-to-pipelines-schedulesShinya Maeda2017-07-071-34/+64
| * | | | Reduce less meaningful test suits from pipeline_schedules_controller_spec.rbShinya Maeda2017-07-061-108/+0
View Lorry Controller Status