summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project...feature/project-exportJames Lopez2016-06-16225-1860/+2819
|\
| * Merge branch 'backport-view-condition-improvement-from-ee-460' into 'master' Douwe Maan2016-06-164-10/+5
| |\
| | * Fix permission checks in member rowbackport-view-condition-improvement-from-ee-460Rémy Coutable2016-06-152-8/+3
| | * Fix wrong partial path in JS viewRémy Coutable2016-06-152-2/+2
| * | Merge branch 'group-owners-association' into 'master' Rémy Coutable2016-06-161-4/+6
| |\ \
| | * | Turn Group#owners into a has_many associationYorick Peterse2016-06-161-4/+6
| * | | Merge branch 'hide-todo-collapsed-sidebar' into 'master' Jacob Schatz2016-06-161-0/+5
| |\ \ \
| | * | | Hide the Todo button in the collapsed issuable sidebar.hide-todo-collapsed-sidebarConnor Shea2016-06-151-0/+5
| * | | | Merge branch 'long-commit-message-scroll-fix' into 'master' Jacob Schatz2016-06-161-0/+1
| |\ \ \ \
| | * \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into long-commit-mes...Fatih Acet2016-06-16204-1759/+2618
| | |\ \ \ \
| | * | | | | Fix long commit message scroll issue.Fatih Acet2016-06-141-0/+1
| * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into category-search...Fatih Acet2016-06-16208-1789/+2636
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge branch 'toggle-whitespace-button-for-compare-page' into 'master' Jacob Schatz2016-06-152-0/+7
| | |\ \ \ \ \
| | | * | | | | added whitespace toggle to diffs page and set it to return the project compar...Luke "Jared" Bennett2016-06-102-0/+7
| | * | | | | | Merge branch 'award-emoji-fix' into 'master' Jacob Schatz2016-06-151-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | Fix emoji block selector.award-emoji-fixFatih Acet2016-06-111-1/+1
| | * | | | | | | Revert "Merge branch '18047-event-item-links-dont-look-like-links' into 'mast...revert-b4e8d59bJacob Schatz2016-06-151-1/+1
| | * | | | | | | Merge branch 'network-assets' into 'master' Jacob Schatz2016-06-155-14/+22
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fix failing test.Connor Shea2016-06-101-1/+1
| | | * | | | | | | Replace raphael-rails with raphael.js so it can be split from the rest of the...Connor Shea2016-06-105-14/+22
| | | |/ / / / / /
| | * | | | | | | Merge branch '18047-event-item-links-dont-look-like-links' into 'master' Jacob Schatz2016-06-151-1/+1
| | |\ \ \ \ \ \ \
| | | * | | | | | | Updated '.event-item a' colorLuke "Jared" Bennett2016-06-101-1/+1
| | | | |/ / / / / | | | |/| | | | |
| | * | | | | | | Merge branch '18301-top-navigation-needs-hover-state' into 'master' Jacob Schatz2016-06-151-0/+6
| | |\ \ \ \ \ \ \
| | | * | | | | | | added hover state to top nav linksLuke "Jared" Bennett2016-06-101-0/+6
| | | |/ / / / / /
| | * | | | | | | Merge branch 'milestone-date-clear' into 'master' Jacob Schatz2016-06-153-7/+18
| | |\ \ \ \ \ \ \
| | | * | | | | | | Changed how date gets clearedmilestone-date-clearPhil Hughes2016-06-101-2/+1
| | | * | | | | | | Fixed testsPhil Hughes2016-06-101-6/+8
| | | * | | | | | | Due date can be removed from milestonesPhil Hughes2016-06-103-7/+17
| | * | | | | | | | Merge branch 'add-shortcut-to-copy-file-content-hash-link' into 'master' Jacob Schatz2016-06-153-2/+13
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Added ability to skip the Mousetrap binding resetLuke "Jared" Bennett2016-06-103-2/+13
| | | | |/ / / / / / | | | |/| | | | | |
| | * | | | | | | | Merge branch '17804-pipeline-download-text' into 'master' Jacob Schatz2016-06-151-1/+1
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Pipeline artifacts download button wording improvedLuke "Jared" Bennett2016-06-101-1/+1
| | | |/ / / / / / /
| | * | | | | | | | Merge branch '17929-issue-shortcut-doesnt-work-on-some-pages' into 'master' Jacob Schatz2016-06-151-11/+5
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Tidied dispatcher switch and added shortcuts to project pipelines, milestones...Luke "Jared" Bennett2016-06-101-11/+5
| | | |/ / / / / / /
| | * | | | | | | | Merge branch 'issuable-sidebar-bold' into 'master' Jacob Schatz2016-06-157-29/+28
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Checks against date parsing instead of stringissuable-sidebar-boldPhil Hughes2016-06-102-3/+3
| | | * | | | | | | | Uses already defined color for text in sidebarPhil Hughes2016-06-101-2/+2
| | | * | | | | | | | Updated link colorPhil Hughes2016-06-101-1/+1
| | | * | | | | | | | Corrected all sidebar font weights to correctly match the designPhil Hughes2016-06-107-30/+28
| | | * | | | | | | | Fixed issue with bold in issuable sidebarPhil Hughes2016-06-103-6/+7
| | | | |/ / / / / / | | | |/| | | | | |
| | * | | | | | | | Merge branch '18434-emoji-icon-styling' into 'master' Jacob Schatz2016-06-151-1/+11
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Fixed notes action buttonsLuke "Jared" Bennett2016-06-131-1/+11
| | * | | | | | | | | Merge branch '18340-cannot-click-find-and-download-on-file-page' into 'master' Jacob Schatz2016-06-151-0/+2
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | .tree-controls stacking context now above .tree-holdrLuke "Jared" Bennett2016-06-101-0/+2
| | | | |_|/ / / / / / | | | |/| | | | | | |
| | * | | | | | | | | Merge branch 'commits-ui' into 'master' Jacob Schatz2016-06-159-103/+137
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Updated text expander text colorcommits-uiPhil Hughes2016-06-091-1/+1
| | | * | | | | | | | | Fixed horizontal and veritcal alignment of commit action buttonsPhil Hughes2016-06-081-4/+18
| | | * | | | | | | | | Changed margin to better align verticallyPhil Hughes2016-06-081-1/+1
| | | * | | | | | | | | Vertical alignment of buttons in commit rowPhil Hughes2016-06-082-4/+4
| | | * | | | | | | | | Added short commit ID to mobilePhil Hughes2016-06-082-4/+3