summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'a8a4ca17e444c761ed9fc5dca4542cfec79abe55' into 32815--Add-Custo...32815--Add-Custom-CI-Config-PathGrzegorz Bizon2017-07-0512-174/+75
|\
| * Handles realtime with 2 states for environments tableFilipa Lacerda2017-07-051-0/+21
| * Revert "Merge branch '18000-remember-me-for-oauth-login' into 'master'"revert-6df61942Sean McGivern2017-07-055-160/+1
| * Merge branch '23036-replace-snippets-spinach' into 'master'Rémy Coutable2017-07-056-14/+53
| |\
| | * Replace 'snippets/snippets.feature' spinach with rspecAlexander Randa2017-07-056-14/+53
* | | Use a previous approach for cycle analytics dummy pipelineGrzegorz Bizon2017-07-052-4/+3
* | | Merge remote-tracking branch 'upstream/master' into 32815--Add-Custom-CI-Conf...Lin Jen-Shin2017-07-0553-293/+1373
|\ \ \ | |/ /
| * | Merge branch '33580-fix-api-scoping' into 'master'Douwe Maan2017-07-056-12/+199
| |\ \
| | * | Fix build for !12300.Timothy Andrew2017-07-051-14/+35
| | * | Merge branch 'master' into '33580-fix-api-scoping'Douwe Maan2017-07-04155-2784/+8190
| | |\ \
| | * | | `AccessTokenValidationService` accepts `String` or `API::Scope` scopes.Timothy Andrew2017-06-301-6/+6
| | * | | Extract a `Gitlab::Scope` class.Timothy Andrew2017-06-291-12/+8
| | * | | Implement review comments from @DouweM for !12300.Timothy Andrew2017-06-281-9/+22
| | * | | Implement review comments from @dbalexandre for !12300.Timothy Andrew2017-06-281-13/+11
| | * | | Fix remaining spec failures for !12300.Timothy Andrew2017-06-283-11/+10
| | * | | Test OAuth token scope verification in the `API::Users` endpointTimothy Andrew2017-06-283-14/+71
| | * | | Test `/users` endpoints for the `read_user` scope.Timothy Andrew2017-06-284-34/+78
| | * | | Allow API scope declarations to be applied conditionally.Timothy Andrew2017-06-283-7/+42
| | * | | Initial attempt at refactoring API scope declarations.Timothy Andrew2017-06-282-2/+26
| * | | | Merge branch '18000-remember-me-for-oauth-login' into 'master'Sean McGivern2017-07-055-1/+160
| |\ \ \ \
| | * | | | Add Jasmine tests for `OAuthRememberMe`Timothy Andrew2017-07-042-0/+31
| | * | | | Fix build for !11963.Timothy Andrew2017-07-031-1/+2
| | * | | | Implement review comments for !11963 from @adamniedzielski.Timothy Andrew2017-07-033-16/+24
| | * | | | Add Omniauth OAuth config to the test section of `gitlab.yml`Timothy Andrew2017-07-031-51/+1
| | * | | | Add more providers to the OAuth login integration tests.Timothy Andrew2017-07-031-2/+41
| | * | | | Test the "Remember Me" flow for OAuth-based login.Timothy Andrew2017-07-033-3/+68
| | * | | | Add integration tests around OAuth login.Timothy Andrew2017-07-032-0/+65
| * | | | | Merge branch '34648-use-stub_application_setting-to-test-support_url' into 'm...Sean McGivern2017-07-051-1/+1
| |\ \ \ \ \
| | * | | | | Use stub_application_setting when testing ApplicationHelper#support_url34648-use-stub_application_setting-to-test-support_urlRémy Coutable2017-07-041-1/+1
| * | | | | | Merge branch 'feature/gb/add-test-example-for-commit-status-retries' into 'ma...Sean McGivern2017-07-051-0/+22
| |\ \ \ \ \ \
| | * | | | | | Add test example for external commit status retriesfeature/gb/add-test-example-for-commit-status-retriesGrzegorz Bizon2017-07-051-0/+22
| * | | | | | | Merge branch 'gitaly-submodule-url-for' into 'master'Sean McGivern2017-07-051-0/+32
| |\ \ \ \ \ \ \
| | * | | | | | | Migrate #submodule_url_for to GitalyJacob Vosmaer2017-07-051-0/+32
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge branch 'dm-always-verify-source-branch-can-be-deleted' into 'master'Sean McGivern2017-07-041-11/+58
| |\ \ \ \ \ \ \
| | * | | | | | | Prevent accidental deletion of protected MR source branch by repeating checks...dm-always-verify-source-branch-can-be-deletedDouwe Maan2017-07-041-11/+58
| * | | | | | | | Merge branch 'revert-2c879643' into 'master'Sean McGivern2017-07-041-0/+21
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Revert "Merge branch 'revert-12499' into 'master'"revert-2c879643Douwe Maan2017-07-041-0/+21
| * | | | | | | | | Merge branch 'feature/no-hypen-at-end-of-commit-ref-slug' into 'master'Rémy Coutable2017-07-041-7/+11
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | fixed incorrect test case (for real), added another oneStefan Hanreich2017-06-191-1/+2
| | * | | | | | | | fixed incorrect test caseStefan Hanreich2017-06-191-1/+1
| | * | | | | | | | added additional test caseStefan Hanreich2017-06-181-0/+1
| | * | | | | | | | remove trailing commaStefan Hanreich2017-06-181-1/+1
| | * | | | | | | | fix typoStefan Hanreich2017-06-181-1/+1
| | * | | | | | | | removed superfluos testsStefan Hanreich2017-06-181-7/+1
| | * | | | | | | | Updated spec for build to include new ref_slug invariantsStefan Hanreich2017-06-181-8/+16
| * | | | | | | | | Instrument Unicorn with Ruby exporterPaweł Chojnacki2017-07-044-6/+210
| * | | | | | | | | Remove group modal like remove project modal. Closes #33130Diego Souza2017-07-041-3/+9
| | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Merge branch 'mk-workaround-intermittent-failure' into 'master'Douwe Maan2017-07-041-14/+24
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Reduce 28 test runs to 4mk-workaround-intermittent-failureMichael Kozono2017-06-301-16/+20
| | * | | | | | | | Rspec/AroundBlock doesn’t know about rspec-retryMichael Kozono2017-06-291-1/+1
View Lorry Controller Status