Commit 35526612 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch '6225-unify-app-views-milestones-ee' into 'master'

Resolve "Extract EE specific files/lines for app/views/shared/milestones"

Closes #6225

See merge request gitlab-org/gitlab-ee!5873
parents 77183a79 f37211f3
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
= _('Time tracking') = _('Time tracking')
= icon('spinner spin') = icon('spinner spin')
= render 'shared/milestones/weight', milestone: milestone = render_if_exists 'shared/milestones/weight', milestone: milestone
.block.merge-requests .block.merge-requests
.sidebar-collapsed-icon.has-tooltip{ title: milestone_merge_requests_tooltip_text(milestone), data: { container: 'body', html: 'true', placement: 'left', boundary: 'viewport' } } .sidebar-collapsed-icon.has-tooltip{ title: milestone_merge_requests_tooltip_text(milestone), data: { container: 'body', html: 'true', placement: 'left', boundary: 'viewport' } }
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
- close_msg = group ? 'You may close the milestone now.' : 'Navigate to the project to close the milestone.' - close_msg = group ? 'You may close the milestone now.' : 'Navigate to the project to close the milestone.'
%span All issues for this milestone are closed. #{close_msg} %span All issues for this milestone are closed. #{close_msg}
= render 'shared/milestones/burndown', milestone: @milestone, project: @project = render_if_exists 'shared/milestones/burndown', milestone: @milestone, project: @project
- if is_dynamic_milestone - if is_dynamic_milestone
.table-holder .table-holder
......
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