From dcc6302c851df21a1a87f5019bb208ef40eb1d58 Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Tue, 15 Jul 2014 11:59:37 +0200 Subject: Show milestone state on group milestone show page. --- app/views/groups/milestones/show.html.haml | 4 ++-- 1 file 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 -- cgit v1.2.1 From b916bf4368a2f98ad56e395376888a8126e1563a Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Tue, 15 Jul 2014 12:27:29 +0200 Subject: Fix test for no milestone description. --- features/steps/group/group.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/features/steps/group/group.rb b/features/steps/group/group.rb index 28c370e828f..288524f92b2 100644 --- a/features/steps/group/group.rb +++ b/features/steps/group/group.rb @@ -190,7 +190,6 @@ class Groups < Spinach::FeatureSteps step 'I should see group milestone with descriptions and expiry date' do page.should have_content('Lorem Ipsum is simply dummy text of the printing and typesetting industry') page.should have_content('expires at Aug 20, 2014') - page.should have_content('Project milestone has no description') end step 'I should see group milestone with all issues and MRs assigned to that milestone' do -- cgit v1.2.1