summaryrefslogtreecommitdiff
path: root/app/views/projects/milestones/show.html.haml
diff options
context:
space:
mode:
authorValery Sizov <valery@gitlab.com>2016-11-15 19:48:30 +0200
committerValery Sizov <valery@gitlab.com>2016-11-23 13:41:04 +0200
commit3789cfe056c1d8a5fb91267cc2b1dd0f9f5902a9 (patch)
tree45314bfcb16ba7095e209d3a1f3eb9be2016b2a6 /app/views/projects/milestones/show.html.haml
parentd7eeb6df51ffe2ad864ef49d0e465b88ab158520 (diff)
downloadgitlab-ce-3789cfe056c1d8a5fb91267cc2b1dd0f9f5902a9.tar.gz
Add a starting date to milestonesmilestone_start_date
Diffstat (limited to 'app/views/projects/milestones/show.html.haml')
-rw-r--r--app/views/projects/milestones/show.html.haml6
1 files changed, 4 insertions, 2 deletions
diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml
index e01aca3dda6..c3a6096aa54 100644
--- a/app/views/projects/milestones/show.html.haml
+++ b/app/views/projects/milestones/show.html.haml
@@ -10,15 +10,17 @@
Closed
- elsif @milestone.expired?
Past due
+ - elsif @milestone.upcoming?
+ Upcoming
- else
Open
.header-text-content
%span.identifier
Milestone ##{@milestone.iid}
- - if @milestone.expires_at
+ - if @milestone.due_date || @milestone.start_date
%span.creator
&middot;
- = @milestone.expires_at
+ = milestone_date_range(@milestone)
.milestone-buttons
- if can?(current_user, :admin_milestone, @project)
- if @milestone.active?