diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-07 21:09:16 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-07 21:09:16 +0300 |
| commit | 38e6d9291369e346f33f52a5ab656b787ce0a2c0 (patch) | |
| tree | c5137121d6cc0ff5d9372252569c10a05164b794 /app/assets/javascripts/merge_request.js | |
| parent | 2a501f63df96252295df7efe53880c5e78fa22b5 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/merge_request.js')
| -rw-r--r-- | app/assets/javascripts/merge_request.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_request.js b/app/assets/javascripts/merge_request.js index a77f339f5a1..80eb94a5364 100644 --- a/app/assets/javascripts/merge_request.js +++ b/app/assets/javascripts/merge_request.js @@ -94,7 +94,11 @@ MergeRequest.prototype.initMRBtnListeners = function () { .put(draftToggle.href, null, { params: { format: 'json' } }) .then(({ data }) => { draftToggle.removeAttribute('disabled'); - eventHub.$emit('MRWidgetUpdateRequested'); + + if (!window.gon?.features?.realtimeMrStatusChange) { + eventHub.$emit('MRWidgetUpdateRequested'); + } + MergeRequest.toggleDraftStatus(data.title, wipEvent === 'ready'); }) .catch(() => { |