From 86bc36c547439011f11c2a1c9a3f853254486ee7 Mon Sep 17 00:00:00 2001 From: Filipa Lacerda Date: Thu, 18 Jan 2018 17:33:06 +0000 Subject: Move mr_widget_auto_merge_failed component into a vue file --- .../states/mr_widget_auto_merge_failed.js | 47 ------------------- .../states/mr_widget_auto_merge_failed.vue | 52 ++++++++++++++++++++++ .../vue_merge_request_widget/dependencies.js | 2 +- .../javascripts/vue_merge_request_widget/index.js | 3 ++ 4 files changed, 56 insertions(+), 48 deletions(-) delete mode 100644 app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.js create mode 100644 app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue (limited to 'app') diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.js deleted file mode 100644 index 5648208f7b1..00000000000 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.js +++ /dev/null @@ -1,47 +0,0 @@ -import eventHub from '../../event_hub'; -import statusIcon from '../mr_widget_status_icon'; - -export default { - name: 'MRWidgetAutoMergeFailed', - props: { - mr: { type: Object, required: true }, - }, - data() { - return { - isRefreshing: false, - }; - }, - components: { - statusIcon, - }, - methods: { - refreshWidget() { - this.isRefreshing = true; - eventHub.$emit('MRWidgetUpdateRequested', () => { - this.isRefreshing = false; - }); - }, - }, - template: ` -
- -
- - - This merge request failed to be merged automatically - -