summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Added proposal json data.merge-request-conflictsFatih Acet2016-06-291-0/+43
* Fix conflicts template.Fatih Acet2016-06-291-9/+23
* Side by side and inline view HTML and CSS.Fatih Acet2016-06-292-94/+470
* Initial commit.Fatih Acet2016-06-278-9/+174
* Merge branch 'refactor/ci-config-add-entry-error' into 'master' Rémy Coutable2016-06-2718-65/+292
|\
| * Merge branch 'master' into refactor/ci-config-add-entry-errorrefactor/ci-config-add-entry-errorGrzegorz Bizon2016-06-20211-745/+10821
| |\
| * | Extract CI entry config hash validation to validatorGrzegorz Bizon2016-06-173-7/+9
| * | Merge branch 'master' into refactor/ci-config-add-entry-errorGrzegorz Bizon2016-06-17238-1555/+11968
| |\ \
| * | | Add first custom validator for new ci configGrzegorz Bizon2016-06-174-9/+21
| * | | Rename legacy validation helpers for new ci configGrzegorz Bizon2016-06-173-3/+3
| * | | Improve CI config entries validations prototypeGrzegorz Bizon2016-06-179-25/+144
| * | | Add prototype of CI config node validatorGrzegorz Bizon2016-06-1612-101/+108
| * | | Add class that encapsulates error in new Ci configGrzegorz Bizon2016-06-1512-8/+95
* | | | Merge branch 'remove-unused-templates-from-gitlab-ci' into 'master' Rémy Coutable2016-06-276-65/+0
|\ \ \ \
| * | | | Clean up some unused templates imported from GitLab CITakuya Noguchi2016-06-266-65/+0
* | | | | Merge branch 'add-debugging-tips' into 'master' Achilleas Pipinellis2016-06-263-0/+263
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add debugging tips with gdbStan Hu2016-06-243-0/+263
* | | | | Merge branch 'patch-1' into 'master' Stan Hu2016-06-261-1/+1
|\ \ \ \ \
| * | | | | Removed unneeded wordIan Lee2016-06-261-1/+1
* | | | | | Update CHANGELOG for 8.9.1Robert Speicher2016-06-251-12/+41
|/ / / / /
* | | | | Merge branch 'issue_19096' into 'master' Stan Hu2016-06-252-0/+47
|\ \ \ \ \
| * | | | | Validate presence of essential params for diff renderingissue_19096Ruben Davila2016-06-242-0/+47
* | | | | | Merge branch 'issue_15588' into 'master' Jacob Schatz2016-06-244-36/+38
|\ \ \ \ \ \
| * | | | | | Add specs and improve coffescript sortable binding functionissue_15588Felipe Artur2016-06-245-41/+37
| * | | | | | Fix issue being ordered twice and callback when moving between statesFelipe Artur2016-06-244-3/+9
* | | | | | | Merge branch 'upgrade-sentry' into 'master' Robert Speicher2016-06-242-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Upgrade sentry-raven from 0.15.6 to 1.1.0.Connor Shea2016-06-242-3/+3
* | | | | | | | Merge branch 'js-content-for' into 'master' Jacob Schatz2016-06-2428-28/+26
|\ \ \ \ \ \ \ \
| * | | | | | | | Appease Rubocop.js-content-forConnor Shea2016-06-231-1/+1
| * | | | | | | | Trying to make this work with sprockets in production.Connor Shea2016-06-234-10/+8
| * | | | | | | | Fix teaspoon tests.Connor Shea2016-06-234-5/+5
| * | | | | | | | Readability.Connor Shea2016-06-231-1/+1
| * | | | | | | | Add precompilation for relevant assets.Connor Shea2016-06-231-0/+2
| * | | | | | | | Reorganize the lib directory.Connor Shea2016-06-2319-7/+4
| * | | | | | | | Re-implement page-specific JS in a better way.Connor Shea2016-06-2310-16/+17
* | | | | | | | | Merge branch 'add-smtp-setting' into 'master' Stan Hu2016-06-241-0/+1
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Add SMTP as default delivery method to match gitlab-org/omnibus-gitlab!826Stan Hu2016-06-241-0/+1
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch '19035-fix-merge-issue' into 'master' Stan Hu2016-06-244-5/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix a wrong MR status when merge_when_build_succeeds & project.only_allow_mer...19035-fix-merge-issueRémy Coutable2016-06-244-5/+25
* | | | | | | | | Merge branch 'health-check-disable-email' into 'master' Rémy Coutable2016-06-242-0/+15
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Set the health_check mailer full checks to be the same as the standard checksDJ Mountney2016-06-241-0/+1
| * | | | | | | | Disable the email checking part of the standard Health Checkhealth-check-disable-emailDJ Mountney2016-06-242-0/+14
* | | | | | | | | Merge branch 'fix-award-emoji-changelog' into 'master' Yorick Peterse2016-06-241-1/+1
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Fixed award emoji changelog entryYorick Peterse2016-06-241-1/+1
|/ / / / / / / /
* | | | | | | | Merge branch 'update-regexp-doc' into 'master' Achilleas Pipinellis2016-06-241-1/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Update default regexp documentation to match 8172d2c1.update-regexp-docStan Hu2016-06-221-1/+1
* | | | | | | | Merge branch 'mahcsig/gitlab-ce-17818-group-issues-api'Rémy Coutable2016-06-244-2/+256
|\ \ \ \ \ \ \ \
| * | | | | | | | gitlab-org/gitlab-ce#17818 - add api call for issues by groupMarc Siegfriedt2016-06-234-2/+256
* | | | | | | | | Merge branch 'redacting-changelog' into 'master' Yorick Peterse2016-06-241-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Added changelog entry for redacting improvementsYorick Peterse2016-06-241-0/+1
|/ / / / / / / / /