Read about our upcoming Code of Conduct on this issue

Commit d1001e3d authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Merge branch 'show_milestone_status_on_show_page' into 'master'

Show milestone status on group milestone show page

Closes #1430

See merge request !969
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment