Merge branch...

Merge branch 'Resolve-Migrate-.fa-spinner-app/assets/javascripts/notes/components/discussion_resolve_button.vue' into 'master'

Resolve Migrate '.fa-spinner' to '.spinner' for 'app/assets/javascripts/notes/components/discussion_resolve_button.vue'

See merge request gitlab-org/gitlab!25055

app/assets/javascripts/notes/components/discussion_resolve_button.vue

 <script>
+import { GlLoadingIcon } from '@gitlab/ui';
+
 export default {
   name: 'ResolveDiscussionButton',
+  components: {
+    GlLoadingIcon,
+  },
   props: {
     isResolving: {
       type: Boolean,
@@ -17,12 +22,7 @@ export default {
 
 <template>
   <button ref="button" type="button" class="btn btn-default ml-sm-2" @click="$emit('onClick')">
-    <i
-      v-if="isResolving"
-      ref="isResolvingIcon"
-      aria-hidden="true"
-      class="fa fa-spinner fa-spin"
-    ></i>
+    <gl-loading-icon v-if="isResolving" ref="isResolvingIcon" inline />
     {{ buttonTitle }}
   </button>
 </template>

app/assets/stylesheets/framework/spinner.scss

@@ -51,7 +51,8 @@
 }
 
 .btn {
-  .spinner {
+  .spinner,
+  .gl-spinner {
     vertical-align: text-bottom;
   }
 }

changelogs/unreleased/Resolve-Migrate--fa-spinner-app-assets-javascripts-notes-components-discu.yml

+---
+title: Migrate .fa-spinner to .spinner for app/assets/javascripts/notes/components/discussion_resolve_button.vue
+merge_request: 25055
+author: nuwe1
+type: other