summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/pages/milestones
diff options
context:
space:
mode:
authorConstance Okoghenun <cokoghenun@gitlab.com>2019-05-21 09:58:22 +0000
committerFilipa Lacerda <filipa@gitlab.com>2019-05-21 09:58:22 +0000
commit05e518a469680b9af45c92a885f402b90b91052c (patch)
tree095d25427b1df54dd4bc65507c6c3c6b05f5bc07 /app/assets/javascripts/pages/milestones
parent5ae293e33c4d6c8187543778717474a7aaccee1c (diff)
downloadgitlab-ce-05e518a469680b9af45c92a885f402b90b91052c.tar.gz
Resolved EE differences in promote milestone modal vue component
Created shared mixins for modal content
Diffstat (limited to 'app/assets/javascripts/pages/milestones')
-rw-r--r--app/assets/javascripts/pages/milestones/shared/components/promote_milestone_modal.vue8
1 files changed, 5 insertions, 3 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 a79ef07f1c5..c563514d36b 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
@@ -33,8 +33,7 @@ export default {
text() {
return sprintf(
s__(`Milestones|Promoting %{milestoneTitle} will make it available for all projects inside %{groupName}.
- Existing project milestones with the same title will be merged.
- This action cannot be reversed.`),
+ Existing project milestones with the same title will be merged.`),
{ milestoneTitle: this.milestoneTitle, groupName: this.groupName },
);
},
@@ -72,6 +71,9 @@ export default {
<template slot="title">
{{ title }}
</template>
- {{ text }}
+ <div>
+ <p>{{ text }}</p>
+ <p>{{ s__('Milestones|This action cannot be reversed.') }}</p>
+ </div>
</gl-modal>
</template>