Add latest changes from gitlab-org/gitlab@13-4-stable-ee

1 files changed, 4 insertions, 5 deletions

diff --git a/app/assets/javascripts/notes/components/discussion_resolve_button.vue b/app/assets/javascripts/notes/components/discussion_resolve_button.vue
index 77f6f1e51c5..e060a6affd4 100644
--- a/app/assets/javascripts/notes/components/discussion_resolve_button.vue
+++ b/app/assets/javascripts/notes/components/discussion_resolve_button.vue
@@ -1,10 +1,10 @@
 <script>
-import { GlLoadingIcon } from '@gitlab/ui';
+import { GlButton } from '@gitlab/ui';
 
 export default {
   name: 'ResolveDiscussionButton',
   components: {
-    GlLoadingIcon,
+    GlButton,
   },
   props: {
     isResolving: {
@@ -21,8 +21,7 @@ export default {
 </script>
 
 <template>
-  <button ref="button" type="button" class="btn btn-default ml-sm-2" @click="$emit('onClick')">
-    <gl-loading-icon v-if="isResolving" ref="isResolvingIcon" inline />
+  <gl-button :loading="isResolving" class="ml-sm-2" @click="$emit('onClick')">
     {{ buttonTitle }}
-  </button>
+  </gl-button>
 </template>