summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Avoid open/close transaction in each gon helper callproper-default-issue-trackerPaco Guzman2016-06-276-6/+23
* 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
|/ / / / / /
* | | | | | Merge branch 'fix/gitlab-import-project-file-fix' into 'master' Rémy Coutable2016-06-244-5/+23
|\ \ \ \ \ \
| * | | | | | fix paramsJames Lopez2016-06-241-2/+2
| * | | | | | Fix tmp file being deleted after the request plus some cleanup and improved e...James Lopez2016-06-244-5/+23
* | | | | | | Merge branch 'refactor-rendering-redacting' into 'master' Yorick Peterse2016-06-2414-32/+434
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Support for rendering/redacting multiple documentsYorick Peterse2016-06-2414-32/+434
|/ / / / / /
* | | | | | 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-238-28/+27
|\ \ \ \ \ \ \
| * | | | | | | Restrict hamlit version, remove coffeescript filters.Connor Shea2016-06-235-5/+7
| * | | | | | | Add changelog entry.Connor Shea2016-06-221-0/+1
| * | | | | | | Remove Haml helpers from the visibility level spec.Connor Shea2016-06-221-5/+0
| * | | | | | | Replace Haml with Hamlit.connorshea2016-06-225-22/+23
* | | | | | | | Merge branch 'zj-pipeline-can-be-nil'Douwe Maan2016-06-232-2/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Check if pipeline is nil before mergingzj-pipeline-can-be-nilZ.J. van de Weg2016-06-232-2/+10
* | | | | | | | | Merge branch 'fix-logo' into 'master' Jacob Schatz2016-06-231-1/+0
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Remove width restriction for logo on sign-in page.Connor Shea2016-06-231-1/+0