summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Updated to add parenthesesref-dropdown-jquery-objectsPhil Hughes2016-06-222-7/+7
| * | | | | | | | | | | Empty the content before append anything to the dropdownPhil Hughes2016-06-221-1/+3
| * | | | | | | | | | | Use jQuery objects in ref dropdownPhil Hughes2016-06-222-12/+16
* | | | | | | | | | | | Merge branch 'optimize-award-emoji' into 'master' Yorick Peterse2016-06-235-12/+25
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Preload notes/discussions associations (award_emoji: :user)optimize-award-emojiPaco Guzman2016-06-236-14/+27
| * | | | | | | | | | | | Eager load award emoji on notesZ.J. van de Weg2016-06-232-2/+2
* | | | | | | | | | | | | Merge branch '18569-fix-diff-note-position' into 'master' Robert Speicher2016-06-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Restore old behavior around diff notes to outdated discussionsDouwe Maan2016-06-221-1/+1
* | | | | | | | | | | | | Merge branch 'bump-gitlab-git-10-2-1' into 'master' Stan Hu2016-06-232-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Bump gitlab_git to 10.2.3Stan Hu2016-06-231-1/+1
| * | | | | | | | | | | | | Bump gitlab_git to 10.2.1 to fix false truncated warnings with ISO-8559 filesStan Hu2016-06-232-1/+2
* | | | | | | | | | | | | | Merge branch 'document-emoji-rake-tasks' into 'master' Achilleas Pipinellis2016-06-231-0/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Added basic docs for the Emoji Rake tasksdocument-emoji-rake-tasksYorick Peterse2016-06-231-0/+20
* | | | | | | | | | | | | | Merge branch 'issue_14563' into 'master' Rémy Coutable2016-06-232-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix user creation with stronger minimum password requirements:qNathan Bush2016-06-232-1/+2
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'merge-settings-help-link' into 'master' Stan Hu2016-06-232-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix merge requests project settings help link anchor.Steve Norman2016-06-232-1/+2
| |/ / / / / / / / / / / /