summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Renamed es6 filediff-comments-avatarsPhil Hughes2017-03-073-3/+3
* Merge branch 'master' into diff-comments-avatarsPhil Hughes2017-03-072982-33663/+34178
|\
| * Merge branch 'fix-project-last-commit-padding' into 'master' Dmitriy Zaporozhets2017-03-072-23/+9
| |\
| | * Fix project-last-commit alignmentfix-project-last-commit-paddingAnnabel Dunstone Gray2017-03-062-23/+9
| * | Merge branch 'remove-readme-option' into 'master' Dmitriy Zaporozhets2017-03-073-11/+6
| |\ \
| | * | Remove readme-only project view preferenceremove-readme-optionAnnabel Dunstone Gray2017-03-063-11/+6
| | |/
| * | Merge branch '23948-assign-to-me' into 'master' Alfredo Sumaran2017-03-0710-23/+55
| |\ \
| | * | re-add Assign to Me link on new MR/Issue formsSimon Knox2017-03-0710-23/+55
| * | | Merge branch 'widget-widget-widget-fun' into 'master' Jacob Schatz2017-03-077-51/+133
| |\ \ \
| | * | | thinner bottom header borderwidget-widget-widget-funRegis2017-03-061-0/+1
| | * | | make header match old 16px padding of body contentsRegis2017-03-061-2/+2
| | * | | fix border radius bottom for headerRegis2017-03-061-1/+2
| | * | | match padding for mr-widget sectionsRegis2017-03-061-1/+1
| | * | | one period instead of twoRegis2017-03-061-1/+1
| | * | | structure html to handle single or double merge states with new style changesRegis2017-03-062-2/+2
| | * | | scss lintingRegis2017-03-061-3/+3
| | * | | MWBS htmlRegis2017-03-061-9/+14
| | * | | fix contains merge conflicts buttonRegis2017-03-031-2/+1
| | * | | Improve CSS for treeview with pipelines to make it responsibleFilipa Lacerda2017-03-042-40/+33
| | * | | add grey lines - adequate spacing for action buttonsRegis2017-03-034-34/+104
| | * | | Merge branch 'master' into widget-widget-widget-funFilipa Lacerda2017-03-03624-4500/+9596
| | |\ \ \
| | * | | | Change the size of CI icon in MR heading [ci skip]Filipa Lacerda2017-02-282-1/+6
| | * | | | Merge branch 'master' into widget-widget-widget-funRegis2017-02-271387-8875/+16972
| | |\ \ \ \
| | * | | | | shape header - bold correct text - border radius - white background for the r...Regis2017-02-172-3/+11
| * | | | | | Merge branch '19062-relax-font-awesome-rails' into 'master' Robert Speicher2017-03-072-3/+3
| |\ \ \ \ \ \
| | * | | | | | Update font-awesome-rails to 4.7.0.119062-relax-font-awesome-railsRémy Coutable2017-03-071-1/+1
| | * | | | | | Relax font-awesome-rails dependency to ~> 4.7Rémy Coutable2017-03-072-2/+2
| * | | | | | | Merge branch '26371-native-emojis-v3' into 'master' Filipa Lacerda2017-03-071845-10674/+10599
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch '26371-native-emojis-v3-code' into '26371-native-emojis-v3' 26371-native-emojis-v3Eric Eastwood2017-03-0653-10674/+10599
| | |\ \ \ \ \ \ \
| | | * | | | | | | Update changelog26371-native-emojis-v3-codeEric Eastwood2017-03-061-0/+0
| | | * | | | | | | Fix up @DouweM reviewEric Eastwood2017-03-067-38/+38
| | | * | | | | | | Fix wrong image src with cached gl-emoji and relative rootEric Eastwood2017-03-066-27/+21
| | | * | | | | | | Fix up potential for build finish event to fire for wrong menuEric Eastwood2017-03-062-5/+4
| | | * | | | | | | Fix up off index when reading canvas and something failedEric Eastwood2017-03-061-3/+6
| | | * | | | | | | Fix up emoji not being next to autocomplete labelEric Eastwood2017-03-061-0/+7
| | | * | | | | | | Fix emoji cut-off line-heightEric Eastwood2017-03-063-4/+3
| | | * | | | | | | Fix up `watch` alias lookup in FirefoxEric Eastwood2017-03-062-2/+3
| | | * | | | | | | Use native unicode emojisEric Eastwood2017-03-0651-10643/+10565
| | |/ / / / / / /
| | * | | | | | | Add emoji images (generated from `rake gemojione:sprite`)Eric Eastwood2017-03-061792-0/+0
| * | | | | | | | Merge branch 'backport-ee-change-webpack-empty-states' into 'master' Jacob Schatz2017-03-071-0/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Backport change introduced in EE - alias for empty states SVGsbackport-ee-change-webpack-empty-statesFilipa Lacerda2017-03-031-0/+1
| * | | | | | | | | Merge branch '28598-narrow-environment-payload-by-using-basic-project' into '...Rémy Coutable2017-03-074-3/+10
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Narrow environment payload by using basic project details resource28598-narrow-environment-payload-by-using-basic-projectOswaldo Ferreira2017-03-064-3/+10
| * | | | | | | | | | Merge branch 'use-publish-to-post-notifications' into 'master' Rémy Coutable2017-03-074-8/+76
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Use set_key_and_notifyuse-publish-to-post-notificationsKamil Trzcinski2017-03-061-1/+1
| | * | | | | | | | | Update notification codeKamil Trzcinski2017-03-063-12/+9
| | * | | | | | | | | Add specs for notificationsKamil Trzcinski2017-03-032-1/+55
| | * | | | | | | | | Add support for Workhorse notificationsKamil Trzcinski2017-03-033-6/+23
| * | | | | | | | | | Merge branch '28538-restore-nav-shortcuts' into 'master' Alfredo Sumaran2017-03-0610-9/+108
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Restore keyboard shortcuts for "Activity" and "Charts"Kushal Pandya2017-03-0610-9/+108
| |/ / / / / / / / / /