diff options
| author | Felipe Artur <felipefac@gmail.com> | 2018-08-06 16:02:52 -0300 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2018-08-06 17:31:47 -0300 |
| commit | abb50ff4710e264c0c700df88757ee3ab1cf7dfb (patch) | |
| tree | a77ce62f4384becfe7b36fa1ae7fea700895812f /app/assets | |
| parent | cb2e07309b4e61501a44c3568155bdb73252338f (diff) | |
| download | gitlab-ce-abb50ff4710e264c0c700df88757ee3ab1cf7dfb.tar.gz | |
Allow to delete group milestonesissue_36138
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/pages/groups/milestones/show/index.js | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/pages/milestones/shared/components/delete_milestone_modal.vue | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/app/assets/javascripts/pages/groups/milestones/show/index.js b/app/assets/javascripts/pages/groups/milestones/show/index.js index 74cc4ba42c1..ebaea5ef3dc 100644 --- a/app/assets/javascripts/pages/groups/milestones/show/index.js +++ b/app/assets/javascripts/pages/groups/milestones/show/index.js @@ -1,8 +1,10 @@ import initMilestonesShow from '~/pages/milestones/shared/init_milestones_show'; +import initDeleteMilestoneModal from '~/pages/milestones/shared/delete_milestone_modal_init'; + import Milestone from '~/milestone'; document.addEventListener('DOMContentLoaded', () => { initMilestonesShow(); - + initDeleteMilestoneModal(); Milestone.initDeprecationMessage(); }); diff --git a/app/assets/javascripts/pages/milestones/shared/components/delete_milestone_modal.vue b/app/assets/javascripts/pages/milestones/shared/components/delete_milestone_modal.vue index 4061c11ba8f..48668562f09 100644 --- a/app/assets/javascripts/pages/milestones/shared/components/delete_milestone_modal.vue +++ b/app/assets/javascripts/pages/milestones/shared/components/delete_milestone_modal.vue @@ -40,8 +40,8 @@ if (this.issueCount === 0 && this.mergeRequestCount === 0) { return sprintf( s__(`Milestones| -You’re about to permanently delete the milestone %{milestoneTitle} from this project. -%{milestoneTitle} is not currently used in any issues or merge requests.`), +You’re about to permanently delete the milestone %{milestoneTitle}. +This milestone is not currently used in any issues or merge requests.`), { milestoneTitle, }, @@ -51,7 +51,7 @@ You’re about to permanently delete the milestone %{milestoneTitle} from this p return sprintf( s__(`Milestones| -You’re about to permanently delete the milestone %{milestoneTitle} from this project and remove it from %{issuesWithCount} and %{mergeRequestsWithCount}. +You’re about to permanently delete the milestone %{milestoneTitle} and remove it from %{issuesWithCount} and %{mergeRequestsWithCount}. Once deleted, it cannot be undone or recovered.`), { milestoneTitle, |