Commit 47cd6a06 authored by Rémy Coutable's avatar Rémy Coutable

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

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

See merge request gitlab-org/gitlab-ce!19185
parents 8adf5395 22eb7881
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
%span= milestone.issues_visible_to_user(current_user).count %span= milestone.issues_visible_to_user(current_user).count
.title.hide-collapsed .title.hide-collapsed
Issues Issues
%span.badg.badge-pille= milestone.issues_visible_to_user(current_user).count %span.badge.badge-pill= milestone.issues_visible_to_user(current_user).count
- if show_new_issue_link?(project) - if show_new_issue_link?(project)
= link_to new_project_issue_path(project, issue: { milestone_id: milestone.id }), class: "float-right", title: "New Issue" do = link_to new_project_issue_path(project, issue: { milestone_id: milestone.id }), class: "float-right", title: "New Issue" do
New issue New issue
...@@ -99,6 +99,8 @@ ...@@ -99,6 +99,8 @@
= _('Time tracking') = _('Time tracking')
= icon('spinner spin') = icon('spinner spin')
= 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' } }
%strong %strong
......
...@@ -48,6 +48,8 @@ ...@@ -48,6 +48,8 @@
- 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_if_exists 'shared/milestones/burndown', milestone: @milestone, project: @project
- if is_dynamic_milestone - if is_dynamic_milestone
.table-holder .table-holder
%table.table %table.table
......
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