summaryrefslogtreecommitdiff
path: root/spec/javascripts/vue_mr_widget/components/states/mr_widget_conflicts_spec.js
Commit message (Expand)AuthorAgeFilesLines
* Moves more mr widget components into vue filesfl-mr-widget-refactorFilipa Lacerda2018-01-241-79/+59
* Port semi-linear merge strategy to CE (mostly FE)Eric Eastwood2017-09-291-2/+2
* Use js- classes instead of Vue refs in tests for some perfEric Eastwood2017-09-261-7/+19
* Use new shared Vue mountComponent methodEric Eastwood2017-09-201-15/+5
* Port fast-forward MR widget states from EEEric Eastwood2017-09-191-33/+66
* clean up merge request widget UISimon Knox2017-08-071-6/+7
* Merge request widget redesignFatih Acet2017-05-091-0/+69