Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42

1 files changed, 5 insertions, 1 deletions

diff --git a/app/assets/javascripts/merge_request.js b/app/assets/javascripts/merge_request.js
index 244cf1e150a..829e2264152 100644
--- a/app/assets/javascripts/merge_request.js
+++ b/app/assets/javascripts/merge_request.js
@@ -72,11 +72,15 @@ MergeRequest.prototype.initMRBtnListeners = function () {
         const wipEvent = getParameterValues('merge_request[wip_event]', url)[0];
         const mobileDropdown = draftToggle.closest('.dropdown.show');
 
+        const loader = document.createElement('span');
+        loader.classList.add('gl-spinner', 'gl-mr-3');
+
         if (mobileDropdown) {
           $(mobileDropdown.firstElementChild).dropdown('toggle');
         }
 
         draftToggle.setAttribute('disabled', 'disabled');
+        draftToggle.prepend(loader);
 
         axios
           .put(draftToggle.href, null, { params: { format: 'json' } })
@@ -124,7 +128,7 @@ MergeRequest.prototype.submitNoteForm = function (form, $button) {
 
 MergeRequest.decreaseCounter = function (by = 1) {
   const $el = $('.js-merge-counter');
-  const count = Math.max(parseInt($el.text().replace(/[^\d]/, ''), 10) - by, 0);
+  const count = Math.max(parseInt($el.first().text().replace(/[^\d]/, ''), 10) - by, 0);
 
   $el.text(addDelimiter(count));
 };