summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Enable Style/SpaceAfterComma Rubocop coprubocop/enable-space-after-copsGrzegorz Bizon2016-06-293-6/+6
* Enable Style/SpaceAfterColon Rubocop copsGrzegorz Bizon2016-06-292-2/+2
* Merge branch 'zj-workhorse-format-patch' into 'master' Robert Speicher2016-06-291-15/+3
|\
| * Workhorse to serve email diffsZ.J. van de Weg2016-06-281-15/+3
* | Add specssystem-infoJosh Frye2016-06-281-0/+17
* | Merge branch 'fix/builds-api-builds-for-commit-search' into 'master' Rémy Coutable2016-06-281-12/+49
|\ \
| * | Improve commit builds API endpoint RESTful behaviorGrzegorz Bizon2016-06-281-15/+48
| * | Find all builds for commit if multiple pipelinesGrzegorz Bizon2016-06-281-2/+6
* | | Use clock_gettime for all performance timestampsperformance-clock-adjustmentsYorick Peterse2016-06-281-2/+14
|/ /
* | Merge branch 'feature/custom-highlighting' into 'master' Rémy Coutable2016-06-282-0/+28
|\ \
| * | support cgi style options, such as erb?parent=jsonhttp://jneen.net/2016-06-272-4/+15
| * | appease rubocophttp://jneen.net/2016-06-271-2/+2
| * | check the tag so that an instance will pass toohttp://jneen.net/2016-06-271-1/+1
| * | fix the spec, using project.change_headhttp://jneen.net/2016-06-272-3/+10
| * | 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
| * | add custom highlighting via .gitattributeshttp://jneen.net/2016-06-271-0/+10
* | | Merge remote-tracking branch 'dev/master'Robert Speicher2016-06-274-1/+135
|\ \ \ | |/ / |/| |
| * | Merge branch 'fix-18997' into 'master' Robert Speicher2016-06-272-1/+100
| |\ \
| | * | Fix visibility of private project snippets for members when searchingDouglas Barbosa Alexandre2016-06-222-16/+58
| | * | Fix internal snippets can be searched by anyoneDouglas Barbosa Alexandre2016-06-222-1/+58
| * | | Merge branch '19102-fix' into 'master' Robert Speicher2016-06-272-0/+35
| |\ \ \
| | * | | Fix an information disclosure when requesting access to a group containing pr...Rémy Coutable2016-06-242-0/+35
* | | | | 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
|\ \ \ \ \ \ \