Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'fix/builds-api-builds-for-commit-search' into 'master' | Rémy Coutable | 2016-06-28 | 1 | -12/+49 |
|\ | |||||
| * | Improve commit builds API endpoint RESTful behavior | Grzegorz Bizon | 2016-06-28 | 1 | -15/+48 |
| * | Find all builds for commit if multiple pipelines | Grzegorz Bizon | 2016-06-28 | 1 | -2/+6 |
* | | Use clock_gettime for all performance timestampsperformance-clock-adjustments | Yorick Peterse | 2016-06-28 | 1 | -2/+14 |
|/ | |||||
* | Merge branch 'feature/custom-highlighting' into 'master' | Rémy Coutable | 2016-06-28 | 2 | -0/+28 |
|\ | |||||
| * | support cgi style options, such as erb?parent=json | http://jneen.net/ | 2016-06-27 | 2 | -4/+15 |
| * | appease rubocop | http://jneen.net/ | 2016-06-27 | 1 | -2/+2 |
| * | check the tag so that an instance will pass too | http://jneen.net/ | 2016-06-27 | 1 | -1/+1 |
| * | fix the spec, using project.change_head | http://jneen.net/ | 2016-06-27 | 2 | -3/+10 |
| * | Revert "bump the master sha for gitlab-test!9" | http://jneen.net/ | 2016-06-27 | 1 | -1/+1 |
| * | bump the master sha for gitlab-test!9 | http://jneen.net/ | 2016-06-27 | 1 | -1/+1 |
| * | add custom highlighting via .gitattributes | http://jneen.net/ | 2016-06-27 | 1 | -0/+10 |
* | | Merge remote-tracking branch 'dev/master' | Robert Speicher | 2016-06-27 | 4 | -1/+135 |
|\ \ | |/ |/| | |||||
| * | Merge branch 'fix-18997' into 'master' | Robert Speicher | 2016-06-27 | 2 | -1/+100 |
| |\ | |||||
| | * | Fix visibility of private project snippets for members when searching | Douglas Barbosa Alexandre | 2016-06-22 | 2 | -16/+58 |
| | * | Fix internal snippets can be searched by anyone | Douglas Barbosa Alexandre | 2016-06-22 | 2 | -1/+58 |
| * | | Merge branch '19102-fix' into 'master' | Robert Speicher | 2016-06-27 | 2 | -0/+35 |
| |\ \ | |||||
| | * | | Fix an information disclosure when requesting access to a group containing pr... | Rémy Coutable | 2016-06-24 | 2 | -0/+35 |
* | | | | Rename Licenses API to License Templates API | Drew Blessing | 2016-06-27 | 1 | -1/+1 |
* | | | | Merge branch 'issue_18398' into 'master' | Douwe Maan | 2016-06-27 | 1 | -0/+21 |
|\ \ \ \ | |||||
| * | | | | Check for conflict with wiki projects when creating a new project.issue_18398 | Ruben Davila | 2016-06-27 | 1 | -0/+21 |
* | | | | | Use HTTP matchers if possible | Z.J. van de Weg | 2016-06-27 | 67 | -1015/+1015 |
* | | | | | Merge branch 'emoji-menu-stick-search' into 'master' | Jacob Schatz | 2016-06-27 | 2 | -2/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Fixed award emoji tests | Phil Hughes | 2016-06-20 | 2 | -2/+1 |
* | | | | | Merge branch 'image-sizing' into 'master' | Rémy Coutable | 2016-06-27 | 2 | -1/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Wrap images in divs with Banzai and limit max-height.image-sizing | Connor Shea | 2016-06-27 | 2 | -1/+6 |
* | | | | | | Merge branch 'test-gitlab-ci-ymls' into 'master' | Rémy Coutable | 2016-06-27 | 1 | -0/+12 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Test templates and GitLabCI parser againts each othertest-gitlab-ci-ymls | Z.J. van de Weg | 2016-06-27 | 1 | -0/+12 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'case-insensitive-ci-skip' into 'master' | Rémy Coutable | 2016-06-27 | 1 | -1/+47 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Add support for "skip ci" too | Simon Welsh | 2016-06-25 | 1 | -1/+32 |
| * | | | | | Allow "ci skip" to be in any case | Simon Welsh | 2016-06-25 | 1 | -0/+15 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'refactor/ci-config-add-entry-error' into 'master' | Rémy Coutable | 2016-06-27 | 8 | -19/+158 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into refactor/ci-config-add-entry-errorrefactor/ci-config-add-entry-error | Grzegorz Bizon | 2016-06-20 | 47 | -159/+7255 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| * | | | | | Extract CI entry config hash validation to validator | Grzegorz Bizon | 2016-06-17 | 1 | -0/+0 |
| * | | | | | Merge branch 'master' into refactor/ci-config-add-entry-error | Grzegorz Bizon | 2016-06-17 | 49 | -155/+1200 |
| |\ \ \ \ \ | |||||
| * | | | | | | Add first custom validator for new ci config | Grzegorz Bizon | 2016-06-17 | 1 | -0/+0 |
| * | | | | | | Improve CI config entries validations prototype | Grzegorz Bizon | 2016-06-17 | 4 | -11/+127 |
| * | | | | | | Add prototype of CI config node validator | Grzegorz Bizon | 2016-06-16 | 5 | -32/+10 |
| * | | | | | | Add class that encapsulates error in new Ci config | Grzegorz Bizon | 2016-06-15 | 6 | -3/+48 |
* | | | | | | | Merge branch 'issue_19096' into 'master' | Stan Hu | 2016-06-25 | 1 | -0/+40 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | Validate presence of essential params for diff renderingissue_19096 | Ruben Davila | 2016-06-24 | 1 | -0/+40 |
* | | | | | | | Merge branch 'js-content-for' into 'master' | Jacob Schatz | 2016-06-24 | 4 | -5/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix teaspoon tests. | Connor Shea | 2016-06-23 | 4 | -5/+5 |
| |/ / / / / / | |||||
* | | | | | | | Fix a wrong MR status when merge_when_build_succeeds & project.only_allow_mer...19035-fix-merge-issue | Rémy Coutable | 2016-06-24 | 1 | -0/+12 |
* | | | | | | | Merge branch 'mahcsig/gitlab-ce-17818-group-issues-api' | Rémy Coutable | 2016-06-24 | 1 | -0/+142 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | gitlab-org/gitlab-ce#17818 - add api call for issues by group | Marc Siegfriedt | 2016-06-23 | 1 | -0/+142 |
* | | | | | | | | Support for rendering/redacting multiple documents | Yorick Peterse | 2016-06-24 | 3 | -0/+198 |
| |_|_|_|_|/ / |/| | | | | | | |||||
* | | | | | | | Merge branch 'fix-settings-spec' into 'master' | Stan Hu | 2016-06-24 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix settings_spec so that it can that run by itselffix-settings-spec | Stan Hu | 2016-06-23 | 1 | -0/+1 |
* | | | | | | | | Merge branch 'hamlit-test' into 'master' | Robert Speicher | 2016-06-23 | 1 | -5/+0 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | |