summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into 26732-combine-deploy-keys-and-push-rules-and-mirro...26732-combine-deploy-keys-and-push-rules-and-mirror-repository-and-protect-branches-settings-pagesPhil Hughes2017-03-071892-2868/+3956
|\
| * Merge branch 'default-kubernetes-namespace' into 'master' Sean McGivern2017-03-071-1/+1
| |\
| | * Make a default namespace of Kubernetes service to contain project IDdefault-kubernetes-namespaceKamil Trzcinski2017-03-061-1/+1
| * | Merge branch 'protected-branch-dropdown-headings' into 'master' Sean McGivern2017-03-072-2/+3
| |\ \
| | * | Backport protected branches Ruby change from EEprotected-branch-dropdown-headingsPhil Hughes2017-03-062-2/+3
| * | | Merge branch 'dz-nested-groups-restrictions' into 'master' Dmitriy Zaporozhets2017-03-072-7/+16
| |\ \ \
| | * | | Restrict nested group names to prevent ambiguous routesdz-nested-groups-restrictionsDmitriy Zaporozhets2017-03-072-7/+16
| * | | | Merge branch '28019-make-builds-show-faster' into 'master' Kamil Trzciński2017-03-072-2/+1
| |\ \ \ \
| | * | | | Avoid calling Build#trace_with_state for performanceTakuya Noguchi2017-03-072-2/+1
| * | | | | 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-071-3/+2
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Remove readme-only project view preferenceremove-readme-optionAnnabel Dunstone Gray2017-03-061-3/+2
| | |/ / / /
| * | | | | Merge branch '23948-assign-to-me' into 'master' Alfredo Sumaran2017-03-076-21/+28
| |\ \ \ \ \
| | * | | | | re-add Assign to Me link on new MR/Issue formsSimon Knox2017-03-076-21/+28
| * | | | | | 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-03197-1399/+1449
| | |\ \ \ \ \ \
| | * | | | | | | 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-27428-3528/+4009
| | |\ \ \ \ \ \ \
| | * | | | | | | | shape header - bold correct text - border radius - white background for the r...Regis2017-02-172-3/+11
| * | | | | | | | | Merge branch '26371-native-emojis-v3' into 'master' Filipa Lacerda2017-03-071817-2246/+2799
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix up @DouweM reviewEric Eastwood2017-03-062-1/+4
| | * | | | | | | | | Fix wrong image src with cached gl-emoji and relative rootEric Eastwood2017-03-061-3/+14
| | * | | | | | | | | Fix up potential for build finish event to fire for wrong menuEric Eastwood2017-03-061-4/+3
| | * | | | | | | | | 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-0624-2247/+2777
| | * | | | | | | | | Add emoji images (generated from `rake gemojione:sprite`)Eric Eastwood2017-03-061792-0/+0
| * | | | | | | | | | Merge branch 'use-publish-to-post-notifications' into 'master' Rémy Coutable2017-03-071-8/+5
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Update notification codeKamil Trzcinski2017-03-061-6/+4
| | * | | | | | | | | | Add support for Workhorse notificationsKamil Trzcinski2017-03-031-6/+5
| * | | | | | | | | | | Restore keyboard shortcuts for "Activity" and "Charts"Kushal Pandya2017-03-063-4/+34
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'rs-carrierwave-db' into 'master' Douwe Maan2017-03-0611-1/+165
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into 'rs-carrierwave-db'rs-carrierwave-dbDouwe Maan2017-03-0615-6/+148
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / | | | |/| | | | | | | |
| | * | | | | | | | | | Add `has_many` associations for models that can have Upload recordsRobert Speicher2017-03-064-0/+4
| | * | | | | | | | | | Handle relative and absolute Upload paths in the UploadersRobert Speicher2017-03-063-6/+45
| | * | | | | | | | | | Add `RecordsUploads` module to record Upload records via callbacksRobert Speicher2017-03-064-0/+46