summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_request.js
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-04-12 12:08:50 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-04-12 12:08:50 +0000
commit47bb4281f0b12f158923f8a1e5691c7a4be2f2f6 (patch)
tree319d236945ce62673cab2fdcc5331e79ef0c01ba /app/assets/javascripts/merge_request.js
parent2e3f13a01a2833f85fb2201a245205b8e9d0ca9a (diff)
downloadgitlab-ce-47bb4281f0b12f158923f8a1e5691c7a4be2f2f6.tar.gz
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.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/assets/javascripts/merge_request.js b/app/assets/javascripts/merge_request.js
index 7c16b54c7d5..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' } })