summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.vue
Commit message (Expand)AuthorAgeFilesLines
* Allow custom hooks errors to appear in GitLab UILuke Duncalfe2019-03-261-1/+1
* Prettify all the thingsMike Greiling2018-11-201-27/+7
* Merge branch 'master' into fl-eslint-vue-house-keepingFilipa Lacerda2018-06-121-1/+5
|\
| * mergeError message has been binded using v-html directiveMurat Dogan2018-06-121-2/+6
* | Updates eslint vue plugin versionFilipa Lacerda2018-06-111-3/+3
|/
* Rename btn-secondary to btn-defaultAnnabel Dunstone Gray2018-05-101-1/+1
* Merge branch 'master' into 'bootstrap4'Clement Ho2018-04-301-49/+53
|\
| * Clear refresh interval when MRWidgetFailedToMerge component is destroyedWinnie Hellmann2018-04-261-49/+53
* | [skip ci] Convert btn-xs to btn-smClement Ho2018-04-121-1/+1
* | Rename .btn-default to .btn-secondaryClement Ho2018-04-091-1/+1
|/
* Moves components into vue files:fl-mr-widget-componentsFilipa Lacerda2018-01-251-0/+105