Merge branch '25957-marking-a-diff-discussion-as-resolved-doesn-t-update-tooltips' into 'master'

Defer tooltip update on Resolve Comment button after DOM cycle

Closes #25957

See merge request !8335

app/assets/javascripts/diff_notes/components/resolve_btn.js.es6

@@ -59,9 +59,11 @@
     },
     methods: {
       updateTooltip: function () {
+        this.$nextTick(() => {
           $(this.$refs.button)
             .tooltip('hide')
             .tooltip('fixTitle');
+        });
       },
       resolve: function () {
         if (!this.canResolve) return;
@@ -90,7 +92,7 @@
             new Flash('An error occurred when trying to resolve a comment. Please try again.', 'alert');
           }
 
-          this.$nextTick(this.updateTooltip);
+          this.updateTooltip();
         });
       }
     },