Merge branch...

Merge branch '10091-move-ee-differences-for-app-assets-javascripts-pages-milestones-shared-components-promote_milestone_modal-vue' into 'master'

Resolved EE differences in promote milestone modal vue component

See merge request gitlab-org/gitlab-ce!28114

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>

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"