Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 6 deletions

diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js
index b3b189c1114..9e2231922b7 100644
--- a/app/assets/javascripts/notes.js
+++ b/app/assets/javascripts/notes.js
@@ -1808,11 +1808,7 @@ export default class Notes {
     $editingNote.removeClass('is-editing fade-in-full').addClass('being-posted fade-in-half');
     $editingNote
       .find('.note-headline-meta a')
-      .html(
-        `<i class="fa fa-spinner fa-spin" aria-label="${__(
-          'Comment is being updated',
-        )}" aria-hidden="true"></i>`,
-      );
+      .html('<span class="spinner align-text-bottom"></span>');
 
     // Make request to update comment on server
     axios
@@ -1825,7 +1821,7 @@ export default class Notes {
         // Submission failed, revert back to original note
         $noteBodyText.html(escape(cachedNoteBodyText));
         $editingNote.removeClass('being-posted fade-in');
-        $editingNote.find('.fa.fa-spinner').remove();
+        $editingNote.find('.spinner').remove();
 
         // Show Flash message about failure
         this.updateNoteError();