summaryrefslogtreecommitdiff
path: root/spec/support
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'add-2fa-check-to-oauth' into 'master' Robert Speicher2016-07-122-0/+35
|\
| * Refactor `mock_auth_hash`Patricio Cano2016-07-111-1/+1
| * Added a lot of stubbing to make sure OAUth requests are handled properly with...Patricio Cano2016-07-072-1/+11
| * Move Omniauth specific setup to its own filePatricio Cano2016-07-071-0/+1
| * Change order of stubbing to fix testsPatricio Cano2016-07-041-1/+0
| * Added tests for 2FA check on OAuth requestPatricio Cano2016-07-041-0/+25
* | We're not using them (and look at the typo)remove-unused-helperLin Jen-Shin2016-07-121-8/+0
* | Fix feature specs on CIsingle-file-diffsSean McGivern2016-07-111-15/+14
* | Support renames in diff_for_path actionsSean McGivern2016-07-111-13/+15
* | Ensure only renderable text diffs are collapsedSean McGivern2016-07-081-0/+8
* | Improve the error message displayed when branch creation fails.Timothy Andrew2016-07-051-1/+1
* | Merge branch 'user-avatar-header' into 'master' Dmitriy Zaporozhets2016-07-041-1/+2
|\ \
| * | Fixed logout testsPhil Hughes2016-06-281-1/+2
* | | Enable Style/EmptyLines cop, remove redundant onesrubocop/enable-cops-for-empty-linesGrzegorz Bizon2016-07-011-1/+0
* | | Remove hardcoded gitlab-shell version in test env now that the required tag i...Alejandro Rodríguez2016-06-301-2/+1
* | | Refactor repository paths handling to allow multiple git mount pointsAlejandro Rodríguez2016-06-291-5/+6
| |/ |/|
* | support cgi style options, such as erb?parent=jsonhttp://jneen.net/2016-06-271-1/+1
* | fix the spec, using project.change_headhttp://jneen.net/2016-06-271-0/+1
* | Revert "bump the master sha for gitlab-test!9"http://jneen.net/2016-06-271-1/+1
* | bump the master sha for gitlab-test!9http://jneen.net/2016-06-271-1/+1
|/
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project...feature/project-exportJames Lopez2016-06-161-0/+1
|\
| * Fix Error 500 when viewing a blob with binary characters after the 1024-byte ...Stan Hu2016-06-121-0/+1
* | Revert "squashed merge and fixed conflicts"James Lopez2016-06-161-1/+0
* | squashed merge and fixed conflictsJames Lopez2016-06-161-0/+1
* | Merge branches 'feature/project-export' and 'master' of gitlab.com:gitlab-org...James Lopez2016-06-134-4/+77
|\ \ | |/
| * Merge branch 'make-omniauth-tests-to-not-modify-global-state' into 'master' Yorick Peterse2016-06-091-0/+33
| |\
| | * Move ImportSpecHelper to spec/support/Kamil Trzcinski2016-06-081-0/+33
| * | Merge branch '18019-fix-wiki-linking' into 'master' Rémy Coutable2016-06-091-0/+4
| |\ \ | | |/ | |/|
| | * Hook up the updated `WikiLinkFilter` to the wiki controllers.Timothy Andrew2016-06-091-0/+4
| * | Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-061-0/+36
| |\ \
| | * \ Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-061-0/+36
| | |\ \
| | | * | Add feature specs covering U2F registration and authentication.Timothy Andrew2016-06-061-0/+36
| | | |/
| * | | Rename all `[ci_]commit` to `[ci_]pipeline` in specs and featuresKamil Trzcinski2016-06-031-3/+3
| |/ /
| * | Rename Ci::Commit to Ci::Pipeline and rename some of the ci_commit to pipelineKamil Trzcinski2016-06-021-1/+1
| |/
* | merge hellJames Lopez2016-06-037-21/+58
|\ \ | |/
| * Merge branch 'separate-banzai-references' into 'master' Douwe Maan2016-06-012-2/+6
| |\
| | * Split Markdown rendering & reference gatheringYorick Peterse2016-05-262-2/+6
| * | Pass the "Remember me" value to the 2FA token formrs-remember-me-2faRobert Speicher2016-05-301-2/+4
| |/
| * Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename'Douwe Maan2016-05-201-0/+10
| |\
| | * Create DiffFilter and change SystemNoteService#change_title to use Gitlab::Di...Adam Butler2016-05-181-0/+10
| * | Merge remote-tracking branch 'origin/master' into eReGeBe/gitlab-ce-feature/m...Rémy Coutable2016-05-183-15/+39
| |\ \
| | * | Fix specsKamil Trzcinski2016-05-161-0/+1
| | * | Improve test coverageKamil Trzcinski2016-05-161-1/+5
| | * | Merge branch 'docker-registry' into docker-registry-viewKamil Trzcinski2016-05-132-15/+15
| | |\ \ | | | |/
| | | * Codestyle: make sure we have space around operatorsGabriel Mazetto2016-05-132-15/+15
| | * | Added Docker Registry View testsKamil Trzcinski2016-05-091-0/+12
| | |/
| * | Transforming milestones link references to the short reference formAlejandro Rodríguez2016-04-201-1/+1
| * | Implementing special GitLab markdown reference for milestonesAlejandro Rodríguez2016-04-202-2/+6
* | | Revert "Fix merge conflicts - squashed commit"James Lopez2016-06-037-58/+21
* | | Fix merge conflicts - squashed commitJames Lopez2016-06-037-21/+58