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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
8b2a6d41
Commit
8b2a6d41
authored
Jun 18, 2018
by
Constance Okoghenun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
updated placement of milestone type for dashboard milestone list
parent
d2daa618
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
app/views/shared/milestones/_milestone.html.haml
app/views/shared/milestones/_milestone.html.haml
+7
-7
No files found.
app/views/shared/milestones/_milestone.html.haml
View file @
8b2a6d41
-
dashboard
=
local_assigns
[
:dashboard
]
-
dashboard
=
local_assigns
[
:dashboard
]
-
custom_dom_id
=
dom_id
(
milestone
.
try
(
:milestones
)
?
milestone
.
milestones
.
first
:
milestone
)
-
custom_dom_id
=
dom_id
(
milestone
.
try
(
:milestones
)
?
milestone
.
milestones
.
first
:
milestone
)
-
milestone_type
=
milestone
.
group_milestone?
?
'Group Milestone'
:
'Project Milestone'
%li
{
class:
"milestone milestone-#{milestone.closed? ? 'closed' : 'open'}"
,
id:
custom_dom_id
}
%li
{
class:
"milestone milestone-#{milestone.closed? ? 'closed' : 'open'}"
,
id:
custom_dom_id
}
.row
.row
.col-sm-6
.col-sm-6
%strong
=
link_to
truncate
(
milestone
.
title
,
length:
100
),
milestone_path
%strong
=
link_to
truncate
(
milestone
.
title
,
length:
100
),
milestone_path
-
if
milestone
.
group_milestone?
-
unless
dashboard
%span
- Group Milestone
=
milestone_type
-
else
%span
- Project Milestone
-
if
@project
||
milestone
.
is_a?
(
GlobalMilestone
)
||
milestone
.
group_milestone?
-
if
@project
||
milestone
.
is_a?
(
GlobalMilestone
)
||
milestone
.
group_milestone?
=
render
(
'shared/milestone_expired'
,
milestone:
milestone
)
=
render
(
'shared/milestone_expired'
,
milestone:
milestone
)
...
@@ -50,9 +49,10 @@
...
@@ -50,9 +49,10 @@
=
link_to
'Reopen Milestone'
,
group_milestone_route
(
milestone
,
{
state_event: :activate
}),
method: :put
,
class:
"btn btn-sm btn-grouped btn-reopen"
=
link_to
'Reopen Milestone'
,
group_milestone_route
(
milestone
,
{
state_event: :activate
}),
method: :put
,
class:
"btn btn-sm btn-grouped btn-reopen"
-
else
-
else
=
link_to
'Close Milestone'
,
group_milestone_route
(
milestone
,
{
state_event: :close
}),
method: :put
,
class:
"btn btn-sm btn-grouped btn-close"
=
link_to
'Close Milestone'
,
group_milestone_route
(
milestone
,
{
state_event: :close
}),
method: :put
,
class:
"btn btn-sm btn-grouped btn-close"
-
if
dashboard
.status-box.status-box-upcoming
=
milestone_type
-
if
milestone
.
is_a?
(
GlobalMilestone
)
||
milestone
.
group_milestone?
.row
.col-sm-6
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