Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-06-09 03:08:57 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-06-09 03:08:57 +0300
commitef270a0e19729fed50f9bb955f113daf5034d366 (patch)
tree73b4dd56e5f7f3858aa668b1778bdba608bc66e0 /app/assets/javascripts/merge_request.js
parenteef3d92529e978c3cabafc321965569776c289b7 (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.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/merge_request.js b/app/assets/javascripts/merge_request.js
index 5058e5a76da..8cdb9eb5fc4 100644
--- a/app/assets/javascripts/merge_request.js
+++ b/app/assets/javascripts/merge_request.js
@@ -95,7 +95,7 @@ MergeRequest.prototype.initMRBtnListeners = function () {
.then(({ data }) => {
draftToggle.removeAttribute('disabled');
eventHub.$emit('MRWidgetUpdateRequested');
- MergeRequest.toggleDraftStatus(data.title, wipEvent === 'unwip');
+ MergeRequest.toggleDraftStatus(data.title, wipEvent === 'ready');
})
.catch(() => {
createFlash({
@@ -168,7 +168,7 @@ MergeRequest.toggleDraftStatus = function (title, isReady) {
draftToggles.forEach((el) => {
const draftToggle = el;
const url = setUrlParams(
- { 'merge_request[wip_event]': isReady ? 'wip' : 'unwip' },
+ { 'merge_request[wip_event]': isReady ? 'draft' : 'ready' },
draftToggle.href,
);