Bring changes from EE
This commit is contained in:
parent
71dea693c6
commit
22eb788161
2 changed files with 5 additions and 1 deletions
|
@ -78,7 +78,7 @@
|
|||
%span= milestone.issues_visible_to_user(current_user).count
|
||||
.title.hide-collapsed
|
||||
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)
|
||||
= link_to new_project_issue_path(project, issue: { milestone_id: milestone.id }), class: "float-right", title: "New Issue" do
|
||||
New issue
|
||||
|
@ -99,6 +99,8 @@
|
|||
= _('Time tracking')
|
||||
= icon('spinner spin')
|
||||
|
||||
= render_if_exists 'shared/milestones/weight', milestone: milestone
|
||||
|
||||
.block.merge-requests
|
||||
.sidebar-collapsed-icon.has-tooltip{ title: milestone_merge_requests_tooltip_text(milestone), data: { container: 'body', html: 'true', placement: 'left', boundary: 'viewport' } }
|
||||
%strong
|
||||
|
|
|
@ -48,6 +48,8 @@
|
|||
- 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}
|
||||
|
||||
= render_if_exists 'shared/milestones/burndown', milestone: @milestone, project: @project
|
||||
|
||||
- if is_dynamic_milestone
|
||||
.table-holder
|
||||
%table.table
|
||||
|
|
Loading…
Reference in a new issue