Refactored promote milestone modal10091-move-ee-differences-for-app-assets-javascripts-pages-milestones-shared-components-promote_milestone_modal-vue

Standadized content between CE and EE

3 files changed, 14 insertions, 24 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 40f7966fbc4..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
@@ -2,9 +2,7 @@
 import axios from '~/lib/utils/axios_utils';
 import createFlash from '~/flash';
 import GlModal from '~/vue_shared/components/gl_modal.vue';
-import promoteMilestoneModalMixin from 'ee_else_ce/pages/milestones/shared/mixins/promote_milestone_modal';
 import { s__, sprintf } from '~/locale';
-import { isEE } from '~/lib/utils/common_utils';
 import { visitUrl } from '~/lib/utils/url_utility';
 import eventHub from '../event_hub';
 
@@ -12,7 +10,6 @@ export default {
   components: {
     GlModal,
   },
-  mixins: [promoteMilestoneModalMixin],
   props: {
     milestoneTitle: {
       type: String,
@@ -33,8 +30,12 @@ export default {
         milestoneTitle: this.milestoneTitle,
       });
     },
-    isEE() {
-      return isEE();
+    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.`),
+        { milestoneTitle: this.milestoneTitle, groupName: this.groupName },
+      );
     },
   },
   methods: {
@@ -70,9 +71,9 @@ export default {
     <template slot="title">
       {{ title }}
     </template>
-    <div v-if="isEE" v-html="text"></div>
-    <template v-else>
-      {{ text }}
-    </template>
+    <div>
+      <p>{{ text }}</p>
+      <p>{{ s__('Milestones|This action cannot be reversed.') }}</p>
+    </div>
   </gl-modal>
 </template>
diff --git a/app/assets/javascripts/pages/milestones/shared/mixins/promote_milestone_modal.js b/app/assets/javascripts/pages/milestones/shared/mixins/promote_milestone_modal.js
deleted file mode 100644
index 7b5ec53e51e..00000000000
--- a/app/assets/javascripts/pages/milestones/shared/mixins/promote_milestone_modal.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import { s__, sprintf } from '~/locale';
-
-export default {
-  computed: {
-    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.`),
-        { milestoneTitle: this.milestoneTitle, groupName: this.groupName },
-      );
-    },
-  },
-};
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index b7aea0254a9..807e95b8d09 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -6037,7 +6037,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"