Merge branch 'show_milestone_status_on_show_page' into 'master'

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

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