summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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 '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
* | | | | | | Merge branch '18438-ios-scrolling' into 'master' Jacob Schatz2016-06-238-125/+109
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Update changelogAnnabel Dunstone2016-06-231-0/+1
| * | | | | | Fix positioning of Repository sub nav scrollingAnnabel Dunstone2016-06-232-1/+20
| * | | | | | Move fade divs out of every scrolling container; remove unneeded scrolling CSSAnnabel Dunstone2016-06-235-114/+61
| * | | | | | Move fade out divs outside of scrolling container on project viewAnnabel Dunstone2016-06-233-19/+36
* | | | | | | Merge branch '19008_ci_dropdown_label_fix' into 'master' Jacob Schatz2016-06-233-0/+6
|\ \ \ \ \ \ \
| * | | | | | | Update tests to check if label is set after picking a template19008_ci_dropdown_label_fixAlfredo Sumaran2016-06-232-0/+2
| * | | | | | | Apply selected value as labelAlfredo Sumaran2016-06-231-0/+4
* | | | | | | | Merge branch 'fix-bulk-assign' into 'master' Jacob Schatz2016-06-235-8/+173
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Update CHANGELOGAlfredo Sumaran2016-06-231-1/+1
| * | | | | | | Use instance property to enable/disable label assignmentAlfredo Sumaran2016-06-233-12/+3
| * | | | | | | Update CHANGELOGAlfredo Sumaran2016-06-231-0/+1
| * | | | | | | Add tests to check fixesAlfredo Sumaran2016-06-231-3/+148
| * | | | | | | Disable Label update when no issues are selectedAlfredo Sumaran2016-06-231-1/+7
| * | | | | | | Apply labels only if we picked a label from the dropdownAlfredo Sumaran2016-06-232-4/+26
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch '18536_status_dropdown_label' into 'master' Jacob Schatz2016-06-232-4/+11
|\ \ \ \ \ \ \
| * | | | | | | Update dropdown text accordingly to selected item18536_status_dropdown_labelAlfredo Sumaran2016-06-171-0/+7
| * | | | | | | Pass dropdown instance to toggleLabel callbackAlfredo Sumaran2016-06-171-4/+4
* | | | | | | | Merge branch 'ref-dropdown-jquery-objects' into 'master' Jacob Schatz2016-06-232-12/+18
|\ \ \ \ \ \ \ \