Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | Fix tmp file being deleted after the request plus some cleanup and improved e... | James Lopez | 2016-06-24 | 4 | -5/+23 | |
* | | | | | | | | | | Merge branch 'refactor-rendering-redacting' into 'master' | Yorick Peterse | 2016-06-24 | 14 | -32/+434 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Support for rendering/redacting multiple documents | Yorick Peterse | 2016-06-24 | 14 | -32/+434 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | 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 | 8 | -28/+27 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Restrict hamlit version, remove coffeescript filters. | Connor Shea | 2016-06-23 | 5 | -5/+7 | |
| * | | | | | | | | | | Add changelog entry. | Connor Shea | 2016-06-22 | 1 | -0/+1 | |
| * | | | | | | | | | | Remove Haml helpers from the visibility level spec. | Connor Shea | 2016-06-22 | 1 | -5/+0 | |
| * | | | | | | | | | | Replace Haml with Hamlit. | connorshea | 2016-06-22 | 5 | -22/+23 | |
* | | | | | | | | | | | Merge branch 'zj-pipeline-can-be-nil' | Douwe Maan | 2016-06-23 | 2 | -2/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Check if pipeline is nil before mergingzj-pipeline-can-be-nil | Z.J. van de Weg | 2016-06-23 | 2 | -2/+10 | |
* | | | | | | | | | | | | Merge branch 'fix-logo' into 'master' | Jacob Schatz | 2016-06-23 | 1 | -1/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Remove width restriction for logo on sign-in page. | Connor Shea | 2016-06-23 | 1 | -1/+0 | |
* | | | | | | | | | | | | Merge branch '18438-ios-scrolling' into 'master' | Jacob Schatz | 2016-06-23 | 8 | -125/+109 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Update changelog | Annabel Dunstone | 2016-06-23 | 1 | -0/+1 | |
| * | | | | | | | | | | | Fix positioning of Repository sub nav scrolling | Annabel Dunstone | 2016-06-23 | 2 | -1/+20 | |
| * | | | | | | | | | | | Move fade divs out of every scrolling container; remove unneeded scrolling CSS | Annabel Dunstone | 2016-06-23 | 5 | -114/+61 | |
| * | | | | | | | | | | | Move fade out divs outside of scrolling container on project view | Annabel Dunstone | 2016-06-23 | 3 | -19/+36 | |
* | | | | | | | | | | | | Merge branch '19008_ci_dropdown_label_fix' into 'master' | Jacob Schatz | 2016-06-23 | 3 | -0/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Update tests to check if label is set after picking a template19008_ci_dropdown_label_fix | Alfredo Sumaran | 2016-06-23 | 2 | -0/+2 | |
| * | | | | | | | | | | | | Apply selected value as label | Alfredo Sumaran | 2016-06-23 | 1 | -0/+4 | |
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'fix-bulk-assign' into 'master' | Jacob Schatz | 2016-06-23 | 5 | -8/+173 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Update CHANGELOG | Alfredo Sumaran | 2016-06-23 | 1 | -1/+1 | |
| * | | | | | | | | | | | Use instance property to enable/disable label assignment | Alfredo Sumaran | 2016-06-23 | 3 | -12/+3 | |
| * | | | | | | | | | | | Update CHANGELOG | Alfredo Sumaran | 2016-06-23 | 1 | -0/+1 | |
| * | | | | | | | | | | | Add tests to check fixes | Alfredo Sumaran | 2016-06-23 | 1 | -3/+148 | |
| * | | | | | | | | | | | Disable Label update when no issues are selected | Alfredo Sumaran | 2016-06-23 | 1 | -1/+7 | |
| * | | | | | | | | | | | Apply labels only if we picked a label from the dropdown | Alfredo Sumaran | 2016-06-23 | 2 | -4/+26 | |
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch '18536_status_dropdown_label' into 'master' | Jacob Schatz | 2016-06-23 | 2 | -4/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Update dropdown text accordingly to selected item18536_status_dropdown_label | Alfredo Sumaran | 2016-06-17 | 1 | -0/+7 | |
| * | | | | | | | | | | | Pass dropdown instance to toggleLabel callback | Alfredo Sumaran | 2016-06-17 | 1 | -4/+4 | |
* | | | | | | | | | | | | Merge branch 'ref-dropdown-jquery-objects' into 'master' | Jacob Schatz | 2016-06-23 | 2 | -12/+18 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Updated to add parenthesesref-dropdown-jquery-objects | Phil Hughes | 2016-06-22 | 2 | -7/+7 | |
| * | | | | | | | | | | | Empty the content before append anything to the dropdown | Phil Hughes | 2016-06-22 | 1 | -1/+3 | |
| * | | | | | | | | | | | Use jQuery objects in ref dropdown | Phil Hughes | 2016-06-22 | 2 | -12/+16 | |
* | | | | | | | | | | | | Merge branch 'optimize-award-emoji' into 'master' | Yorick Peterse | 2016-06-23 | 5 | -12/+25 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Preload notes/discussions associations (award_emoji: :user)optimize-award-emoji | Paco Guzman | 2016-06-23 | 6 | -14/+27 | |
| * | | | | | | | | | | | | Eager load award emoji on notes | Z.J. van de Weg | 2016-06-23 | 2 | -2/+2 | |
* | | | | | | | | | | | | | Merge branch '18569-fix-diff-note-position' into 'master' | Robert Speicher | 2016-06-23 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Restore old behavior around diff notes to outdated discussions | Douwe Maan | 2016-06-22 | 1 | -1/+1 | |
* | | | | | | | | | | | | | Merge branch 'bump-gitlab-git-10-2-1' into 'master' | Stan Hu | 2016-06-23 | 2 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Bump gitlab_git to 10.2.3 | Stan Hu | 2016-06-23 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | Bump gitlab_git to 10.2.1 to fix false truncated warnings with ISO-8559 files | Stan Hu | 2016-06-23 | 2 | -1/+2 | |
* | | | | | | | | | | | | | | Merge branch 'document-emoji-rake-tasks' into 'master' | Achilleas Pipinellis | 2016-06-23 | 1 | -0/+20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Added basic docs for the Emoji Rake tasksdocument-emoji-rake-tasks | Yorick Peterse | 2016-06-23 | 1 | -0/+20 | |
* | | | | | | | | | | | | | | Merge branch 'issue_14563' into 'master' | Rémy Coutable | 2016-06-23 | 2 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Fix user creation with stronger minimum password requirements:q | Nathan Bush | 2016-06-23 | 2 | -1/+2 | |
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'merge-settings-help-link' into 'master' | Stan Hu | 2016-06-23 | 2 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Fix merge requests project settings help link anchor. | Steve Norman | 2016-06-23 | 2 | -1/+2 | |
| |/ / / / / / / / / / / / |