summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Rename Licenses API to License Templates APIDrew Blessing2016-06-271-1/+1
* Merge branch 'issue_18398' into 'master' Douwe Maan2016-06-271-0/+21
|\
| * Check for conflict with wiki projects when creating a new project.issue_18398Ruben Davila2016-06-271-0/+21
* | Use HTTP matchers if possibleZ.J. van de Weg2016-06-2767-1015/+1015
* | Merge branch 'emoji-menu-stick-search' into 'master' Jacob Schatz2016-06-272-2/+1
|\ \
| * | Fixed award emoji testsPhil Hughes2016-06-202-2/+1
* | | Merge branch 'image-sizing' into 'master' Rémy Coutable2016-06-272-1/+6
|\ \ \
| * | | Wrap images in divs with Banzai and limit max-height.image-sizingConnor Shea2016-06-272-1/+6
* | | | Merge branch 'test-gitlab-ci-ymls' into 'master' Rémy Coutable2016-06-271-0/+12
|\ \ \ \
| * | | | Test templates and GitLabCI parser againts each othertest-gitlab-ci-ymlsZ.J. van de Weg2016-06-271-0/+12
* | | | | Merge branch 'case-insensitive-ci-skip' into 'master' Rémy Coutable2016-06-271-1/+47
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add support for "skip ci" tooSimon Welsh2016-06-251-1/+32
| * | | | Allow "ci skip" to be in any caseSimon Welsh2016-06-251-0/+15
| | |_|/ | |/| |
* | | | Merge branch 'refactor/ci-config-add-entry-error' into 'master' Rémy Coutable2016-06-278-19/+158
|\ \ \ \
| * \ \ \ Merge branch 'master' into refactor/ci-config-add-entry-errorrefactor/ci-config-add-entry-errorGrzegorz Bizon2016-06-2047-159/+7255
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Extract CI entry config hash validation to validatorGrzegorz Bizon2016-06-171-0/+0
| * | | | Merge branch 'master' into refactor/ci-config-add-entry-errorGrzegorz Bizon2016-06-1749-155/+1200
| |\ \ \ \
| * | | | | Add first custom validator for new ci configGrzegorz Bizon2016-06-171-0/+0
| * | | | | Improve CI config entries validations prototypeGrzegorz Bizon2016-06-174-11/+127
| * | | | | Add prototype of CI config node validatorGrzegorz Bizon2016-06-165-32/+10
| * | | | | Add class that encapsulates error in new Ci configGrzegorz Bizon2016-06-156-3/+48
* | | | | | Merge branch 'issue_19096' into 'master' Stan Hu2016-06-251-0/+40
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Validate presence of essential params for diff renderingissue_19096Ruben Davila2016-06-241-0/+40
* | | | | | Merge branch 'js-content-for' into 'master' Jacob Schatz2016-06-244-5/+5
|\ \ \ \ \ \
| * | | | | | Fix teaspoon tests.Connor Shea2016-06-234-5/+5
| |/ / / / /
* | | | | | Fix a wrong MR status when merge_when_build_succeeds & project.only_allow_mer...19035-fix-merge-issueRémy Coutable2016-06-241-0/+12
* | | | | | Merge branch 'mahcsig/gitlab-ce-17818-group-issues-api'Rémy Coutable2016-06-241-0/+142
|\ \ \ \ \ \
| * | | | | | gitlab-org/gitlab-ce#17818 - add api call for issues by groupMarc Siegfriedt2016-06-231-0/+142
* | | | | | | Support for rendering/redacting multiple documentsYorick Peterse2016-06-243-0/+198
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge branch 'fix-settings-spec' into 'master' Stan Hu2016-06-241-0/+1
|\ \ \ \ \ \
| * | | | | | Fix settings_spec so that it can that run by itselffix-settings-specStan Hu2016-06-231-0/+1
* | | | | | | Merge branch 'hamlit-test' into 'master' Robert Speicher2016-06-231-5/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Remove Haml helpers from the visibility level spec.Connor Shea2016-06-221-5/+0
* | | | | | | Merge branch '19008_ci_dropdown_label_fix' into 'master' Jacob Schatz2016-06-232-0/+2
|\ \ \ \ \ \ \
| * | | | | | | Update tests to check if label is set after picking a template19008_ci_dropdown_label_fixAlfredo Sumaran2016-06-232-0/+2
| | |_|/ / / / | |/| | | | |
* | | | | | | Add tests to check fixesAlfredo Sumaran2016-06-231-3/+148
|/ / / / / /
* | | | | | Merge branch 'fix-404-for-pipelines' into 'master' Rémy Coutable2016-06-233-1/+270
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix 404 for pipelinesKamil Trzcinski2016-06-233-1/+270
* | | | | | Merge branch '18915-pagination-with-priority-sort-repeats-results' into 'mast...Rémy Coutable2016-06-231-0/+14
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix pagination on sorts with lots of tiesSean McGivern2016-06-231-0/+14
* | | | | | Merge branch 'fix/import-export-gitlab-errors' into 'master' Rémy Coutable2016-06-232-0/+29
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | fixed pipeline notes issueJames Lopez2016-06-232-0/+29
* | | | | | Add Sidekiq queue duration to transaction metrics.Paco Guzman2016-06-231-1/+16
|/ / / / /
* | | | | Merge branch 'fix_saml_signin' into 'master' Robert Speicher2016-06-221-1/+17
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix subsequent SAML sign insDrew Blessing2016-06-221-1/+17
| | |_|/ | |/| |
* | | | Merge branch 'fix-external-issue-links' into 'master' Robert Speicher2016-06-221-0/+36
|\ \ \ \
| * | | | Handle external issues in IssueReferenceFilterfix-external-issue-linksYorick Peterse2016-06-211-0/+36
| |/ / /
* | | | Merge branch '18871-check-improve-how-we-display-access-requesters-in-admin-a...Douwe Maan2016-06-222-2/+2
|\ \ \ \
| * | | | Fix specsRémy Coutable2016-06-202-2/+2
* | | | | Merge branch '18755-fix-destroy-project-causes-post_decline_request-to-be-exe...Douwe Maan2016-06-2213-58/+149
|\ \ \ \ \