summaryrefslogtreecommitdiff
path: root/spec/support
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | fixed and refactored a few things based on MR feedbackJames Lopez2016-05-061-8/+8
* | | Merge branches 'feature/project-export' and 'master' of gitlab.com:gitlab-org...James Lopez2016-05-031-0/+7
|\ \ \ | | |/ | |/|
| * | Ensure URL in all Service subclasses are validRémy Coutable2016-04-251-0/+7
| |/
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project...James Lopez2016-04-213-8/+28
|\ \ | |/
| * Merge branch 'pmq20/gitlab-ce-issue_12785'Douwe Maan2016-04-191-1/+1
| |\
| | * Add support to cherry-pick any commitP.S.V.R2016-04-181-1/+1
| * | Added System Hooks for push and tag_pushGabriel Mazetto2016-04-191-1/+16
| * | Read job variables directly from gitlab CI configGrzegorz Bizon2016-04-181-6/+11
| |/
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project...James Lopez2016-04-121-4/+5
|\ \ | |/
| * Merge branch 'patch/fix-markdown-preview-wikis' into 'master' Robert Speicher2016-04-071-4/+5
| |\
| | * Fix a few edited references from WikiLinkFilter and specsGabriel Mazetto2016-04-061-4/+5
* | | continuing to refactor config, added spec and fixed a few problemsJames Lopez2016-04-071-0/+20
|/ /
* | Fix creation of merge requests for orphaned branchesStan Hu2016-04-041-0/+1
* | Added & use Gitlab::Routing for URL helpersroutingYorick Peterse2016-04-012-2/+2
* | Move CarrierWave test env config to separate fileGrzegorz Bizon2016-03-301-0/+7
|/
* Tweaks, refactoring, and specsDouwe Maan2016-03-202-22/+1
* Merge branch 'master' into issue_12658Douwe Maan2016-03-203-2/+4
|\
| * Restrict access to references for confidential issuesDouglas Barbosa Alexandre2016-03-171-0/+2
| * Merge branch '4009-external-users' into 'master' Douwe Maan2016-03-171-0/+2
| |\
| * \ Merge branch 'fix-capybara-deprecation-warnings' into 'master' Robert Speicher2016-03-162-2/+2
| |\ \