summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '18080-project-header-alignment' into 'master' Jacob Schatz2016-06-081-1/+9
|\
| * Add flexbox to project header18080-project-header-alignmentAnnabel Dunstone2016-06-011-1/+9
* | Merge branch '18074-cancel-pipeline-text' into 'master' Jacob Schatz2016-06-081-1/+4
|\ \
| * | Change color of canceled ci text to gray18074-cancel-pipeline-textAnnabel Dunstone2016-06-011-1/+4
* | | 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-071-5/+23
|\ \ \ \
| * | | | Updated colorsnotification-dropdown-labelsPhil Hughes2016-06-071-0/+2
| * | | | Notifications dropdown on project page now has descriptionsPhil Hughes2016-06-071-5/+21
* | | | | Merge branch '18058-sub-nav' into 'master' Jacob Schatz2016-06-073-6/+59
|\ \ \ \ \
| * | | | | Fix alignment of wiki top areaAnnabel Dunstone2016-06-071-0/+4
| * | | | | Align links and tabs18058-sub-navAnnabel Dunstone2016-06-071-3/+6
| * | | | | Add scrolling tabs to code subnavAnnabel Dunstone2016-06-071-0/+18
| * | | | | Finish styling sub navAnnabel Dunstone2016-06-072-3/+10
| * | | | | Start styling sub navAnnabel Dunstone2016-06-071-0/+21
| |/ / / /
* | | | | Merge branch '18013-compact-sidebar' into 'master' Jacob Schatz2016-06-074-133/+41
|\ \ \ \ \
| * | | | | Update charcoal theme colors18013-compact-sidebarAnnabel Dunstone2016-06-071-2/+5
| * | | | | Update nav link font size and spacing; fix hamburger iconAnnabel Dunstone2016-06-072-14/+7
| * | | | | Fix control btn positionAnnabel Dunstone2016-06-071-1/+1
| * | | | | Implement compact side navAnnabel Dunstone2016-06-073-120/+32
| |/ / / /
* | | | | Merge branch 'issue_14189' into 'master' Jacob Schatz2016-06-074-1/+130
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Initialize LabelManager only when necessaryAlfredo Sumaran2016-06-061-1/+1
| * | | | Improve functionalityAlfredo Sumaran2016-06-061-18/+21
| * | | | Show proper error message when saving priority failsAlfredo Sumaran2016-06-061-4/+1
| * | | | Sorting improvements and stylingAlfredo Sumaran2016-06-063-1/+34
| * | | | Improve Issuable.order_labels_priorityRémy Coutable2016-06-061-9/+12
| * | | | Prioritize labels functionalityAlfredo Sumaran2016-06-063-0/+93
* | | | | Merge branch 'edit-mobile' into 'master' Jacob Schatz2016-06-062-6/+24
|\ \ \ \ \
| * | | | | Shows the edit comment button on mobileedit-mobilePhil Hughes2016-06-022-6/+24
* | | | | | Merge branch '18026-consider-removing-issue-merge-request-previous-next-butto...Jacob Schatz2016-06-061-18/+0
|\ \ \ \ \ \
| * | | | | | Remove prev/next buttons on issues and merge requests18026-consider-removing-issue-merge-request-previous-next-buttonsAlejandro Rodríguez2016-06-061-18/+0
* | | | | | | Merge branch 'confidential-issue-notice' into 'master' Jacob Schatz2016-06-061-0/+33
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Add confidential issue notice in comment box.Connor Shea2016-06-031-0/+33
* | | | | | | Merge branch 'notes-are-awardables' into 'master' Douwe Maan2016-06-067-117/+206
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Updated MR notes.notes-are-awardablesFatih Acet2016-06-064-18/+16
| * | | | | | Fix scss-lint.Fatih Acet2016-06-061-1/+1
| * | | | | | Added tests for award emoji feature.Fatih Acet2016-06-062-11/+11
| * | | | | | Create and show emoji loader on the fly.Fatih Acet2016-06-062-6/+21
| * | | | | | Some design related tweaks.Fatih Acet2016-06-064-2/+19
| * | | | | | Be consistent on naming.Fatih Acet2016-06-061-22/+22
| * | | | | | Animate emoji when rendered.Fatih Acet2016-06-061-1/+12
| * | | | | | Fix mutual exclusivity for emoji only comments.Fatih Acet2016-06-061-1/+4
| * | | | | | Refactor awardsHandler methods to work with votesBlock.Fatih Acet2016-06-062-35/+36
| * | | | | | Award emoji implementation for notes.Fatih Acet2016-06-061-63/+88
| * | | | | | Show emoji menu in notes.Fatih Acet2016-06-062-3/+22
| * | | | | | Backend awardables on commentsZJ van de Weg2016-06-061-1/+1
* | | | | | | Merge branch 'jquery2' into 'master' Jacob Schatz2016-06-064-6/+7
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Fixed JS errorsjquery2Phil Hughes2016-06-053-5/+6
| * | | | | | Upgraded jQuery to version 2Phil Hughes2016-06-051-1/+1
| |/ / / / /
* | | | | | Implement authentication (login) using a U2F device.Timothy Andrew2016-06-061-0/+63