Commit ea4bf67a authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

Fix promote milestone modal conflicts

parent f5736fac
...@@ -15,7 +15,6 @@ export default { ...@@ -15,7 +15,6 @@ export default {
type: String, type: String,
required: true, required: true,
}, },
<<<<<<< HEAD
url: { url: {
type: String, type: String,
required: true, required: true,
...@@ -23,31 +22,6 @@ export default { ...@@ -23,31 +22,6 @@ export default {
groupName: { groupName: {
type: String, type: String,
required: true, required: true,
=======
props: {
milestoneTitle: {
type: String,
required: true,
},
url: {
type: String,
required: true,
},
groupName: {
type: String,
required: true,
},
},
computed: {
title() {
return sprintf(s__('Milestones|Promote %{milestoneTitle} to group milestone?'), { milestoneTitle: this.milestoneTitle });
},
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 });
},
>>>>>>> upstream/master
}, },
}, },
computed: { computed: {
......
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