Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Remove Haml helpers from the visibility level spec. | Connor Shea | 2016-06-22 | 1 | -5/+0 |
* | | | | | | | Merge branch '19008_ci_dropdown_label_fix' into 'master' | Jacob Schatz | 2016-06-23 | 2 | -0/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Update tests to check if label is set after picking a template19008_ci_dropdown_label_fix | Alfredo Sumaran | 2016-06-23 | 2 | -0/+2 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Add tests to check fixes | Alfredo Sumaran | 2016-06-23 | 1 | -3/+148 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'fix-404-for-pipelines' into 'master' | Rémy Coutable | 2016-06-23 | 3 | -1/+270 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Fix 404 for pipelines | Kamil Trzcinski | 2016-06-23 | 3 | -1/+270 |
* | | | | | | Merge branch '18915-pagination-with-priority-sort-repeats-results' into 'mast... | Rémy Coutable | 2016-06-23 | 1 | -0/+14 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Fix pagination on sorts with lots of ties | Sean McGivern | 2016-06-23 | 1 | -0/+14 |
* | | | | | | Merge branch 'fix/import-export-gitlab-errors' into 'master' | Rémy Coutable | 2016-06-23 | 2 | -0/+29 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | fixed pipeline notes issue | James Lopez | 2016-06-23 | 2 | -0/+29 |
* | | | | | | Add Sidekiq queue duration to transaction metrics. | Paco Guzman | 2016-06-23 | 1 | -1/+16 |
|/ / / / / | |||||
* | | | | | Merge branch 'fix_saml_signin' into 'master' | Robert Speicher | 2016-06-22 | 1 | -1/+17 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Fix subsequent SAML sign ins | Drew Blessing | 2016-06-22 | 1 | -1/+17 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'fix-external-issue-links' into 'master' | Robert Speicher | 2016-06-22 | 1 | -0/+36 |
|\ \ \ \ | |||||
| * | | | | Handle external issues in IssueReferenceFilterfix-external-issue-links | Yorick Peterse | 2016-06-21 | 1 | -0/+36 |
| |/ / / | |||||
* | | | | Merge branch '18871-check-improve-how-we-display-access-requesters-in-admin-a... | Douwe Maan | 2016-06-22 | 2 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Fix specs | Rémy Coutable | 2016-06-20 | 2 | -2/+2 |
* | | | | | Merge branch '18755-fix-destroy-project-causes-post_decline_request-to-be-exe... | Douwe Maan | 2016-06-22 | 13 | -58/+149 |
|\ \ \ \ \ |