Commit c24b86fe authored by Brandon Labuschagne's avatar Brandon Labuschagne Committed by Paul Slaughter

Migrate fa spinner to GlLoadingIcon

This change is being done for mr_widget_auto_merge_enabled.vue
parent 96a0248c
<script> <script>
import { GlLoadingIcon } from '@gitlab/ui';
import autoMergeMixin from 'ee_else_ce/vue_merge_request_widget/mixins/auto_merge'; import autoMergeMixin from 'ee_else_ce/vue_merge_request_widget/mixins/auto_merge';
import { deprecatedCreateFlash as Flash } from '../../../flash'; import { deprecatedCreateFlash as Flash } from '../../../flash';
import statusIcon from '../mr_widget_status_icon.vue'; import statusIcon from '../mr_widget_status_icon.vue';
...@@ -12,6 +13,7 @@ export default { ...@@ -12,6 +13,7 @@ export default {
components: { components: {
MrWidgetAuthor, MrWidgetAuthor,
statusIcon, statusIcon,
GlLoadingIcon,
}, },
mixins: [autoMergeMixin], mixins: [autoMergeMixin],
props: { props: {
...@@ -100,7 +102,7 @@ export default { ...@@ -100,7 +102,7 @@ export default {
class="btn btn-sm btn-default js-cancel-auto-merge" class="btn btn-sm btn-default js-cancel-auto-merge"
@click.prevent="cancelAutomaticMerge" @click.prevent="cancelAutomaticMerge"
> >
<i v-if="isCancellingAutoMerge" class="fa fa-spinner fa-spin" aria-hidden="true"> </i> <gl-loading-icon v-if="isCancellingAutoMerge" inline class="gl-mr-1" />
{{ cancelButtonText }} {{ cancelButtonText }}
</a> </a>
</h4> </h4>
...@@ -122,7 +124,7 @@ export default { ...@@ -122,7 +124,7 @@ export default {
href="#" href="#"
@click.prevent="removeSourceBranch" @click.prevent="removeSourceBranch"
> >
<i v-if="isRemovingSourceBranch" class="fa fa-spinner fa-spin" aria-hidden="true"> </i> <gl-loading-icon v-if="isRemovingSourceBranch" inline class="gl-mr-1" />
{{ s__('mrWidget|Delete source branch') }} {{ s__('mrWidget|Delete source branch') }}
</a> </a>
</p> </p>
......
---
title: Update loading icon for buttons used in MR's set to merge automatically
merge_request: 45693
author:
type: changed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment