summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.js
Commit message (Expand)AuthorAgeFilesLines
* Moves more mr widget components into vue filesfl-mr-widget-refactorFilipa Lacerda2018-01-241-47/+0
* Backport to match EE icons42225-mr-iconsFilipa Lacerda2018-01-191-1/+1
* Use explicit boolean true attribute for show-disabled-button38417-use-explicit-boolean-vue-attributeEric Eastwood2017-10-031-1/+1
* Port semi-linear merge strategy to CE (mostly FE)Eric Eastwood2017-09-291-1/+1
* Add period to multi-sentence rebase locally messageEric Eastwood2017-09-281-1/+1
* Use js- classes instead of Vue refs in tests for some perfEric Eastwood2017-09-261-11/+8
* Port fast-forward MR widget states from EEEric Eastwood2017-09-191-19/+32
* clean up merge request widget UISimon Knox2017-08-071-16/+14
* Merge request widget redesignFatih Acet2017-05-091-0/+39