Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 4 deletions

diff --git a/app/assets/javascripts/merge_request.js b/app/assets/javascripts/merge_request.js
index 80eb94a5364..61abdca0a5b 100644
--- a/app/assets/javascripts/merge_request.js
+++ b/app/assets/javascripts/merge_request.js
@@ -95,10 +95,6 @@ MergeRequest.prototype.initMRBtnListeners = function () {
           .then(({ data }) => {
             draftToggle.removeAttribute('disabled');
 
-            if (!window.gon?.features?.realtimeMrStatusChange) {
-              eventHub.$emit('MRWidgetUpdateRequested');
-            }
-
             MergeRequest.toggleDraftStatus(data.title, wipEvent === 'ready');
           })
           .catch(() => {
@@ -155,6 +151,10 @@ MergeRequest.hideCloseButton = function () {
 };
 
 MergeRequest.toggleDraftStatus = function (title, isReady) {
+  if (!window.gon?.features?.realtimeMrStatusChange) {
+    eventHub.$emit('MRWidgetUpdateRequested');
+  }
+
   if (isReady) {
     toast(__('Marked as ready. Merging is now allowed.'));
   } else {