Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-07-15 18:34:29 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-07-15 18:34:29 +0400
commitd1001e3d98ec294db60f08762c5006e8a8f8c98f (patch)
tree0cae005114a2aec72ebfddaf657cbd41b8397333 /app
parent275a5281d5f35bf2243a0b5814b8fb83f1561105 (diff)
parentb916bf4368a2f98ad56e395376888a8126e1563a (diff)
Merge branch 'show_milestone_status_on_show_page' into 'master'
Show milestone status on group milestone show page Closes #1430 See merge request !969
Diffstat (limited to 'app')
-rw-r--r--app/views/groups/milestones/show.html.haml4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/groups/milestones/show.html.haml b/app/views/groups/milestones/show.html.haml
index 29b274af5a5..411d1822be0 100644
--- a/app/views/groups/milestones/show.html.haml
+++ b/app/views/groups/milestones/show.html.haml
@@ -32,11 +32,11 @@
%h4
= link_to "#{milestone.project.name} - #{milestone.title}", project_milestone_path(milestone.project, milestone)
%span.pull-right= milestone.expires_at
+ - if milestone.closed?
+ %span.label.label-danger #{milestone.state}
= preserve do
- if milestone.description.present?
= milestone.description
- - else
- %em Project milestone has no description
.context
%p