diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-09-12 01:19:21 +0300 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-09-12 01:19:21 +0300 |
| commit | f815b48f3981ad6f225827c3e9cc08850a4f7438 (patch) | |
| tree | ed064db5a87deff150ea8f280f368d87cb31cf2e /app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue | |
| parent | 85aeaf055af3355d04d1d298db41b63570f71fd3 (diff) | |
Use gitlab-ui loading icon
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue index 2133124347c..01294d5b40c 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue @@ -1,5 +1,4 @@ <script> - import loadingIcon from '~/vue_shared/components/loading_icon.vue'; import eventHub from '../../event_hub'; import statusIcon from '../mr_widget_status_icon.vue'; @@ -7,7 +6,6 @@ name: 'MRWidgetAutoMergeFailed', components: { statusIcon, - loadingIcon, }, props: { mr: { @@ -44,7 +42,7 @@ class="btn btn-sm btn-default" @click="refreshWidget" > - <loading-icon + <gl-loading-icon v-if="isRefreshing" :inline="true" /> |