diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-10 07:44:16 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-10 07:44:16 +0000 |
| commit | 4fb5a39dc04822f1cfac1090a431e51fb43e7a07 (patch) | |
| tree | 5d13d1d97c9c70b8b0246a44227d5fd8bf18b8d1 /app | |
| parent | 018602b4c84555e4a3dc49480ede0a98cf757476 (diff) | |
| parent | 4a505f38acdefe1ee023dcdd773385bf7b7270bb (diff) | |
| download | gitlab-ce-4fb5a39dc04822f1cfac1090a431e51fb43e7a07.tar.gz | |
Merge branch 'group_milestones_description' into 'master'
Group milestones description
Fixes #1403
See merge request !958
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/groups/milestones/show.html.haml | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/app/views/groups/milestones/show.html.haml b/app/views/groups/milestones/show.html.haml index 4b6c00a3247..29b274af5a5 100644 --- a/app/views/groups/milestones/show.html.haml +++ b/app/views/groups/milestones/show.html.haml @@ -26,6 +26,18 @@ %h4.title = gfm escape_once(@group_milestone.title) + .description + - @group_milestone.milestones.each do |milestone| + %hr + %h4 + = link_to "#{milestone.project.name} - #{milestone.title}", project_milestone_path(milestone.project, milestone) + %span.pull-right= milestone.expires_at + = preserve do + - if milestone.description.present? + = milestone.description + - else + %em Project milestone has no description + .context %p Progress: |