Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
ea4bf67a
Commit
ea4bf67a
authored
Mar 29, 2018
by
Jose Ivan Vargas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix promote milestone modal conflicts
parent
f5736fac
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
26 deletions
+0
-26
app/assets/javascripts/pages/milestones/shared/components/promote_milestone_modal.vue
.../milestones/shared/components/promote_milestone_modal.vue
+0
-26
No files found.
app/assets/javascripts/pages/milestones/shared/components/promote_milestone_modal.vue
View file @
ea4bf67a
...
@@ -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
:
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment