Commit 1cdb7f3c authored by Filipa Lacerda's avatar Filipa Lacerda

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
parents 5ae293e3 05e518a4
...@@ -33,8 +33,7 @@ export default { ...@@ -33,8 +33,7 @@ export default {
text() { text() {
return sprintf( return sprintf(
s__(`Milestones|Promoting %{milestoneTitle} will make it available for all projects inside %{groupName}. s__(`Milestones|Promoting %{milestoneTitle} will make it available for all projects inside %{groupName}.
Existing project milestones with the same title will be merged. Existing project milestones with the same title will be merged.`),
This action cannot be reversed.`),
{ milestoneTitle: this.milestoneTitle, groupName: this.groupName }, { milestoneTitle: this.milestoneTitle, groupName: this.groupName },
); );
}, },
...@@ -72,6 +71,9 @@ export default { ...@@ -72,6 +71,9 @@ export default {
<template slot="title"> <template slot="title">
{{ title }} {{ title }}
</template> </template>
{{ text }} <div>
<p>{{ text }}</p>
<p>{{ s__('Milestones|This action cannot be reversed.') }}</p>
</div>
</gl-modal> </gl-modal>
</template> </template>
...@@ -6040,7 +6040,10 @@ msgstr "" ...@@ -6040,7 +6040,10 @@ msgstr ""
msgid "Milestones|Promote Milestone" msgid "Milestones|Promote Milestone"
msgstr "" 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 "" msgstr ""
msgid "Mirror a repository" msgid "Mirror a repository"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment