summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'optimise-email-css' into 'master' Robert Speicher2016-06-072-28/+167
|\
| * Optimise email CSS for speed with Premaileroptimise-email-cssSean McGivern2016-06-072-28/+167
* | Merge branch 'notification-dropdown-labels' into 'master' Jacob Schatz2016-06-074-11/+45
|\ \
| * | Updated colorsnotification-dropdown-labelsPhil Hughes2016-06-071-0/+2
| * | Fixed failing testsPhil Hughes2016-06-071-1/+1
| * | Notifications dropdown on project page now has descriptionsPhil Hughes2016-06-074-11/+43
* | | Merge branch '18058-sub-nav' into 'master' Jacob Schatz2016-06-0715-266/+345
|\ \ \
| * | | Fix alignment of wiki top areaAnnabel Dunstone2016-06-072-1/+5
| * | | Align links and tabs18058-sub-navAnnabel Dunstone2016-06-071-3/+6
| * | | Add scrolling tabs to code subnavAnnabel Dunstone2016-06-072-20/+41
| * | | Finish styling sub navAnnabel Dunstone2016-06-0711-211/+234
| * | | Start styling sub navAnnabel Dunstone2016-06-074-52/+80
| |/ /
* | | Merge branch '18013-compact-sidebar' into 'master' Jacob Schatz2016-06-076-157/+57
|\ \ \
| * | | Update charcoal theme colors18013-compact-sidebarAnnabel Dunstone2016-06-071-2/+5
| * | | Update nav link font size and spacing; fix hamburger iconAnnabel Dunstone2016-06-073-24/+17
| * | | Fix control btn positionAnnabel Dunstone2016-06-071-1/+1
| * | | Test impersonation using img data attribute instead of usernameAnnabel Dunstone2016-06-071-1/+1
| * | | Implement compact side navAnnabel Dunstone2016-06-075-143/+47
| |/ /
* | | Merge branch 'issue_14189' into 'master' Jacob Schatz2016-06-0715-29/+255
|\ \ \ | |/ / |/| |
| * | Fix label order by priority on labels pageissue_14189Sean McGivern2016-06-071-2/+2
| * | TypoAlfredo Sumaran2016-06-062-4/+4
| * | Remove unnecessary null-specific orderSean McGivern2016-06-061-2/+2
| * | Tidy up Ruby style in templatesSean McGivern2016-06-062-6/+5
| * | Initialize LabelManager only when necessaryAlfredo Sumaran2016-06-061-1/+1
| * | Show functionality only for users with the ability to edit labelsAlfredo Sumaran2016-06-062-18/+21
| * | Improve functionalityAlfredo Sumaran2016-06-061-18/+21
| * | add :set_priorities to :authorize_admin_labels!Alfredo Sumaran2016-06-061-1/+1
| * | typoAlfredo Sumaran2016-06-061-1/+1
| * | Show prioritized labels only on the first page and when there's labels createdAlfredo Sumaran2016-06-061-1/+4
| * | Remove unnecesary paramAlfredo Sumaran2016-06-061-1/+1
| * | TypoAlfredo Sumaran2016-06-061-2/+2
| * | Update method and routeAlfredo Sumaran2016-06-061-2/+2
| * | Update method nameAlfredo Sumaran2016-06-061-2/+2
| * | Add unprioritized scopeAlfredo Sumaran2016-06-063-7/+9
| * | FeedbackAlfredo Sumaran2016-06-064-13/+9
| * | Fix styleSean McGivern2016-06-061-1/+1
| * | Don't try to count a relation with aliasesSean McGivern2016-06-061-1/+1
| * | Fix syntaxAlfredo Sumaran2016-06-061-4/+4
| * | Show proper error message when saving priority failsAlfredo Sumaran2016-06-061-4/+1
| * | Sorting improvements and stylingAlfredo Sumaran2016-06-066-9/+42
| * | Improve Issuable.order_labels_priorityRémy Coutable2016-06-067-45/+54
| * | Sort by label priorityThijs Wouters2016-06-067-5/+54
| * | Prioritize labels functionalityAlfredo Sumaran2016-06-067-12/+144
* | | Merge branch 'zj-workhorse-to-serve-diffs' into 'master' 14722-searching-for-usernames-should-only-be-possible-for-search-strings-with-a-valid-formatJacob Vosmaer (GitLab)2016-06-072-10/+10
|\ \ \
| * | | Workhorse to serve raw diffsZeger-Jan van de Weg2016-06-032-10/+10
* | | | Merge branch 'rename-ci-commit-phase-3' into 'master' Douwe Maan2016-06-0716-86/+86
|\ \ \ \
| * | | | Rename @ci_commit to @pipeline in MergeRequestControllerrename-ci-commit-phase-3Kamil Trzcinski2016-06-071-4/+4
| * | | | Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3Kamil Trzcinski2016-06-0713-62/+85
| |\ \ \ \
| * \ \ \ \ Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3Kamil Trzcinski2016-06-0617-129/+237
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3Kamil Trzcinski2016-06-0627-112/+520
| |\ \ \ \ \ \