diff options
| author | Constance Okoghenun <cokoghenun@gitlab.com> | 2019-05-21 09:58:22 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-05-21 09:58:22 +0000 |
| commit | 05e518a469680b9af45c92a885f402b90b91052c (patch) | |
| tree | 095d25427b1df54dd4bc65507c6c3c6b05f5bc07 | |
| parent | 5ae293e33c4d6c8187543778717474a7aaccee1c (diff) | |
| download | gitlab-ce-05e518a469680b9af45c92a885f402b90b91052c.tar.gz | |
Resolved EE differences in promote milestone modal vue component
Created shared mixins for modal content
| -rw-r--r-- | app/assets/javascripts/pages/milestones/shared/components/promote_milestone_modal.vue | 8 | ||||
| -rw-r--r-- | locale/gitlab.pot | 5 |
2 files changed, 9 insertions, 4 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> diff --git a/locale/gitlab.pot b/locale/gitlab.pot index a4fb9ec927a..199a2dc5435 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -6040,7 +6040,10 @@ msgstr "" msgid "Milestones|Promote Milestone" msgstr "" -msgid "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." +msgid "Milestones|Promoting %{milestoneTitle} will make it available for all projects inside %{groupName}. Existing project milestones with the same title will be merged." +msgstr "" + +msgid "Milestones|This action cannot be reversed." msgstr "" msgid "Mirror a repository" |