summaryrefslogtreecommitdiff
path: root/spec/support
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs-sign_in' into 'master'Douwe Maan2017-07-093-19/+15
|\
| * Merge branch 'master' into rs-sign_inRobert Speicher2017-07-074-9/+62
| |\
| * \ Merge branch 'master' into rs-sign_inRobert Speicher2017-07-0613-18/+146
| |\ \
| * | | Remove instance variable assignment from `gitlab_sign_in` helperrs-sign_inRobert Speicher2017-06-291-4/+4
| * | | Change gitlab_sign_out to sign_out where possibleRobert Speicher2017-06-291-3/+3
| * | | Remove gitlab_sign_out_direct helperRobert Speicher2017-06-291-6/+1
| * | | Change gitlab_sign_in to sign_in where possibleRobert Speicher2017-06-292-6/+7
* | | | Merge branch 'master' into 'fix/gb/stage-id-reference-background-migration'Grzegorz Bizon2017-07-074-9/+62
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'feature/intermediate/32568-adding-variables-to-pipelines-schedu...Kamil TrzciƄski2017-07-071-2/+26
| |\ \ \
| | * \ \ Merge from master(Fix conflicts)Shinya Maeda2017-07-072-7/+5
| | |\ \ \
| | * \ \ \ merge from masterShinya Maeda2017-07-0710-14/+124
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Revert unnecesarry changesShinya Maeda2017-07-051-1/+1
| | * | | | zj nice catchies 3Shinya Maeda2017-07-051-1/+5
| | * | | | Improved AccessMatchers and testsShinya Maeda2017-07-051-3/+23
| * | | | | Native group milestonesFelipe Artur2017-07-071-0/+31
| | |_|/ / | |/| | |
| * | | | Merge branch 'gitaly-mandatory' into 'master'Sean McGivern2017-07-072-7/+5
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Remove option to disable Gitaly completelyJacob Vosmaer2017-07-072-7/+5
* | | | | Merge remote-tracking branch 'origin/active-record-each-batch' into fix/gb/st...Grzegorz Bizon2017-07-072-1/+17
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '18000-remember-me-for-oauth-login' into 'master'Douwe Maan2017-07-062-1/+17
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix build for !11963.Timothy Andrew2017-07-061-1/+2
| | * | | Implement review comments for !11963 from @adamniedzielski.Timothy Andrew2017-07-062-2/+2
| | * | | Test the "Remember Me" flow for OAuth-based login.Timothy Andrew2017-07-062-1/+9
| | * | | Add integration tests around OAuth login.Timothy Andrew2017-07-061-0/+7
* | | | | Make `inline` a default sidekiq testing processing againGrzegorz Bizon2017-07-071-1/+1
* | | | | Make it possible to schedule bg migrations in bulkGrzegorz Bizon2017-07-071-1/+7
|/ / / /
* | | | Merge branch '32815--Add-Custom-CI-Config-Path' into 'master'Grzegorz Bizon2017-07-061-1/+3
|\ \ \ \
| * \ \ \ Merge commit 'a8a4ca17e444c761ed9fc5dca4542cfec79abe55' into 32815--Add-Custo...32815--Add-Custom-CI-Config-PathGrzegorz Bizon2017-07-052-17/+1
| |\ \ \ \
| * | | | | Use a previous approach for cycle analytics dummy pipelineGrzegorz Bizon2017-07-051-3/+2
| * | | | | Merge remote-tracking branch 'upstream/master' into 32815--Add-Custom-CI-Conf...Lin Jen-Shin2017-07-055-5/+119
| |\ \ \ \ \
| * | | | | | Fix cycle analytics tests by making pipeline validLin Jen-Shin2017-07-051-1/+4
| * | | | | | Follow feedback on the merge requestLin Jen-Shin2017-07-041-3/+1
| * | | | | | Give project to the dummy pipelineLin Jen-Shin2017-07-031-1/+3
| | |_|/ / / | |/| | | |
* | | | | | Create and use project path helpers that only need a project, no namespaceDouwe Maan2017-07-055-8/+11
| |_|/ / / |/| | | |
* | | | | Revert "Merge branch '18000-remember-me-for-oauth-login' into 'master'"revert-6df61942Sean McGivern2017-07-052-17/+1
| |/ / / |/| | |
* | | | Merge branch '33580-fix-api-scoping' into 'master'Douwe Maan2017-07-052-4/+93
|\ \ \ \
| * \ \ \ Merge branch 'master' into '33580-fix-api-scoping'Douwe Maan2017-07-0421-25/+258
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Fix remaining spec failures for !12300.Timothy Andrew2017-06-281-1/+0
| * | | | Test OAuth token scope verification in the `API::Users` endpointTimothy Andrew2017-06-282-13/+68
| * | | | Test `/users` endpoints for the `read_user` scope.Timothy Andrew2017-06-282-2/+35
| * | | | Initial attempt at refactoring API scope declarations.Timothy Andrew2017-06-281-2/+4
* | | | | Merge branch '18000-remember-me-for-oauth-login' into 'master'Sean McGivern2017-07-052-1/+17
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix build for !11963.Timothy Andrew2017-07-031-1/+2
| * | | | Implement review comments for !11963 from @adamniedzielski.Timothy Andrew2017-07-032-2/+2
| * | | | Test the "Remember Me" flow for OAuth-based login.Timothy Andrew2017-07-032-1/+9
| * | | | Add integration tests around OAuth login.Timothy Andrew2017-07-031-0/+7
| | |/ / | |/| |
* | | | Merge branch 'gitaly-clean-up-tests' into 'master'Sean McGivern2017-07-041-0/+9
|\ \ \ \ | |/ / / |/| | |
| * | | Add a UTF-8 encoding matcherJacob Vosmaer2017-06-301-0/+9
* | | | Improve support for external issue referencesadam-external-issue-references-spikeAdam Niedzielski2017-06-301-4/+4
|/ / /
* | | Merge branch 'fix-sidebar-showing-mobile-merge-requests' into 'master'Tim Zallmann2017-06-301-0/+9
|\ \ \ | |_|/ |/| |
| * | Refactored tests and added a breakpoint to the merge_request_tabsfix-sidebar-showing-mobile-merge-requestsJose Ivan Vargas2017-06-291-0/+9
| |/