summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'js-content-for' into 'master' Jacob Schatz2016-06-241-4/+2
|\
| * Appease Rubocop.js-content-forConnor Shea2016-06-231-1/+1
| * Trying to make this work with sprockets in production.Connor Shea2016-06-231-4/+2
* | Replace Haml with Hamlit.connorshea2016-06-221-1/+1
|/
* Merge branch 'remove-banzai-pre-process' into 'master' Robert Speicher2016-06-211-2/+0
|\
| * Move pre_process into render_resultremove-banzai-pre-processYorick Peterse2016-06-211-2/+0
* | Merge branch 'backport_from_ee' into 'master' Valery Sizov2016-06-211-1/+1
|\ \ | |/ |/|
| * Fix on-hover state for 'Edit' button on tree viewValery Sizov2016-06-211-1/+1
* | Merge branch '17521-gitlab-ci-yml-templates' into 'master' Jacob Schatz2016-06-211-6/+10
|\ \
| * | Incorporate reviewZ.J. van de Weg2016-06-201-2/+2
| * | Implement backend gitlab ci dropdownZ.J. van de Weg2016-06-201-4/+10
| * | Refactor Gitlab::GitignoresZJ van de Weg2016-06-201-5/+3
* | | Unify check branch name existPaco Guzman2016-06-202-2/+2
|/ /
* | Merge branch 'async-refs-dropdown' into 'master' Jacob Schatz2016-06-201-16/+0
|\ \
| * | Correctly adds commit ID into dropdownPhil Hughes2016-06-181-16/+0
* | | Merge branch 'markdowner' into 'master' Jacob Schatz2016-06-201-0/+13
|\ \ \ | |/ / |/| |
| * | Updated design of markdown buttonsPhil Hughes2016-06-171-0/+13
* | | Merge branch 'issue_12758' into 'master' Douwe Maan2016-06-171-17/+11
|\ \ \
| * \ \ Merge master into issue_12758issue_12758Felipe Artur2016-06-178-29/+56
| |\ \ \ | | |/ /
| * | | Re-use notifications dropdown/modal for user profileFelipe Artur2016-06-171-16/+8
| |\ \ \
| | * | | Re-use notifications dropdown on user profileFelipe Artur2016-06-161-16/+8
| * | | | Added description to custom option in notification dropdownPhil Hughes2016-06-161-1/+3
* | | | | Merge branch 'fix-18717' into 'master' Douwe Maan2016-06-171-0/+6
|\ \ \ \ \
| * | | | | Address Douwe's feedbackfix-18717Rémy Coutable2016-06-171-2/+2
| * | | | | Ensure group/project owners can see their members' access_levelRémy Coutable2016-06-171-0/+6
| | |_|/ / | |/| | |
* | | | | Merge branch 'issuable-todo-improvements'Douwe Maan2016-06-182-4/+4
|\ \ \ \ \
| * | | | | Checks for current_user when getting todoPhil Hughes2016-06-171-1/+1
| * | | | | Improved manual todosPhil Hughes2016-06-172-4/+4
| |/ / / /
* | | | | Ensure Todos counters doesn't count Todos for projects pending deleteDouglas Barbosa Alexandre2016-06-171-2/+2
| |_|_|/ |/| | |
* | | | Merge branch '18034-cache-todo-counter' into 'master' Yorick Peterse2016-06-171-2/+2
|\ \ \ \
| * | | | Cache todo counters (pending/done)18034-cache-todo-counterPaco Guzman2016-06-171-2/+2
| |/ / /
* | | | Merge branch 'clipboard-buttons-fix' into 'master' Robert Speicher2016-06-171-0/+10
|\ \ \ \
| * | | | Fix clibpoard buttons on "Check out branch" modal.clipboard-buttons-fixConnor Shea2016-06-171-0/+10
| |/ / /
* | | | Fixed styling of clipboard buttonclipboard-button-stylingPhil Hughes2016-06-171-1/+1
|/ / /
* | | Merge branch 'template_dropdown' into 'master' Jacob Schatz2016-06-161-2/+2
|\ \ \
| * | | Implements TemplateDropdown class to create custom template dropdownstemplate_dropdownAlfredo Sumaran2016-06-161-2/+2
* | | | Merge branch 'backport-view-condition-improvement-from-ee-460' into 'master' Douwe Maan2016-06-161-6/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Fix permission checks in member rowbackport-view-condition-improvement-from-ee-460Rémy Coutable2016-06-151-6/+0
* | | | Merge branch 'toggle-whitespace-button-for-compare-page' into 'master' Jacob Schatz2016-06-151-0/+5
|\ \ \ \
| * | | | added whitespace toggle to diffs page and set it to return the project compar...Luke "Jared" Bennett2016-06-101-0/+5
* | | | | Merge branch 'issuable-sidebar-bold' into 'master' Jacob Schatz2016-06-151-1/+1
|\ \ \ \ \
| * | | | | Corrected all sidebar font weights to correctly match the designPhil Hughes2016-06-101-1/+1
* | | | | | Merge branch 'commits-ui' into 'master' Jacob Schatz2016-06-153-13/+29
|\ \ \ \ \ \
| * | | | | | Improved spacing on mobilePhil Hughes2016-06-081-1/+1
| * | | | | | Updated failing testsPhil Hughes2016-06-082-5/+2
| * | | | | | Updated testsPhil Hughes2016-06-082-1/+8
| * | | | | | Updated some commit UI colorsPhil Hughes2016-06-081-2/+2
| * | | | | | Updated commits UIPhil Hughes2016-06-082-11/+23
* | | | | | | Merge branch 'pinned-sidebar' into 'master' Jacob Schatz2016-06-151-4/+16
|\ \ \ \ \ \ \
| * | | | | | | Clicking body closes navpinned-sidebarPhil Hughes2016-06-151-1/+2