summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue
Commit message (Expand)AuthorAgeFilesLines
* Updates eslint vue plugin versionFilipa Lacerda2018-06-111-1/+1
* Rename btn-secondary to btn-defaultAnnabel Dunstone Gray2018-05-101-2/+2
* [skip ci] Convert btn-xs to btn-smClement Ho2018-04-121-2/+2
* Rename .btn-default to .btn-secondaryClement Ho2018-04-091-2/+2
* Update missing pathsfl-more-mr-widgetFilipa Lacerda2018-01-251-1/+1
* Moves more mr widget components into vue filesfl-mr-widget-refactorFilipa Lacerda2018-01-241-0/+61