diff options
Diffstat (limited to 'app/assets/javascripts/pages/milestones/shared/components/promote_milestone_modal.vue')
-rw-r--r-- | app/assets/javascripts/pages/milestones/shared/components/promote_milestone_modal.vue | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/app/assets/javascripts/pages/milestones/shared/components/promote_milestone_modal.vue b/app/assets/javascripts/pages/milestones/shared/components/promote_milestone_modal.vue index af85c3915df..22248418c41 100644 --- a/app/assets/javascripts/pages/milestones/shared/components/promote_milestone_modal.vue +++ b/app/assets/javascripts/pages/milestones/shared/components/promote_milestone_modal.vue @@ -1,10 +1,9 @@ <script> import axios from '~/lib/utils/axios_utils'; import createFlash from '~/flash'; - import { saveFlashMessage } from '~/lib/utils/flash_queue'; import GlModal from '~/vue_shared/components/gl_modal.vue'; - import { redirectTo } from '~/lib/utils/url_utility'; import { s__, sprintf } from '~/locale'; + import { visitUrl } from '~/lib/utils/url_utility'; import eventHub from '../event_hub'; export default { @@ -27,20 +26,17 @@ }, text() { return s__(`Milestones|Promoting this milestone will make it available for all projects inside the group. - Existing project milestones with the same name will be merged. + Existing project milestones with the same title will be merged. This action cannot be reversed.`); }, }, methods: { onSubmit() { eventHub.$emit('promoteMilestoneModal.requestStarted', this.url); - return axios.post(this.url) + return axios.post(this.url, { params: { format: 'json' } }) .then((response) => { eventHub.$emit('promoteMilestoneModal.requestFinished', { milestoneUrl: this.url, successful: true }); - const responseURL = new URL(response.request.responseURL); - const bodyData = responseURL.searchParams.get('body_data'); - saveFlashMessage(bodyData, `${this.milestoneTitle} promoted to group milestone`, 'notice'); - redirectTo(`${responseURL.protocol}//${responseURL.host}${responseURL.pathname}`); + visitUrl(response.data.url); }) .catch((error) => { eventHub.$emit('promoteMilestoneModal.requestFinished', { milestoneUrl: this.url, successful: false }); |