summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | Implement ayufan validatorShinya Maeda2017-07-061-2/+2
| * | | | Improve spec: use go instead of put :updateShinya Maeda2017-07-061-2/+1
| * | | | Revert "Implement Ci::NestedUniquenessValidator"Shinya Maeda2017-07-061-16/+2
| * | | | Implement Ci::NestedUniquenessValidatorShinya Maeda2017-07-051-2/+16
| * | | | zj nice catchies 3Shinya Maeda2017-07-051-25/+25
| * | | | Improve specShinya Maeda2017-07-051-10/+9
| * | | | Implement uniqueness_of_in_memory_validatorShinya Maeda2017-07-051-37/+30
| * | | | Improved AccessMatchers and testsShinya Maeda2017-07-051-3/+3
| * | | | Fix policy by new guild lineShinya Maeda2017-07-051-106/+81
| * | | | Fix StaticAnlysysShinya Maeda2017-07-051-108/+58
| * | | | Revert extra validation for duplication between same keys on a submitShinya Maeda2017-07-051-29/+31
| * | | | Add functionality and security.Shinya Maeda2017-07-051-223/+304
| * | | | Implement variables_attributes create/update casesShinya Maeda2017-07-051-284/+284
| * | | | Improve specShinya Maeda2017-07-051-10/+9
| * | | | Implement uniqueness_of_in_memory_validatorShinya Maeda2017-07-051-37/+30
| * | | | Improved AccessMatchers and testsShinya Maeda2017-07-051-3/+3
| * | | | Fix policy by new guild lineShinya Maeda2017-07-051-106/+81
| * | | | Fix StaticAnlysysShinya Maeda2017-07-051-108/+58
| * | | | Revert extra validation for duplication between same keys on a submitShinya Maeda2017-07-051-29/+31
| * | | | Add functionality and security.Shinya Maeda2017-07-051-223/+304
| * | | | Implement variables_attributes create/update casesShinya Maeda2017-07-051-8/+345
| | |_|/ | |/| |
* | | | Merge branch '34590-fix-dashboard-labels-dropdown' into 'master'Sean McGivern2017-07-071-0/+25
|\ \ \ \
| * | | | Fix dashboard labels dropdownNick Thomas2017-07-071-0/+25
| | |/ / | |/| |
* | | | Native group milestonesFelipe Artur2017-07-072-17/+135
* | | | Resolve "Inconsistent location of members page between groups and projects"Tim Zallmann2017-07-073-25/+10
| |_|/ |/| |
* | | gb nice catchesShinya Maeda2017-07-072-2/+2