diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-05-28 19:48:04 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-05-28 19:48:04 +0300 |
| commit | 47cd6a061b9fc99a33e557a256357148ccb1362d (patch) | |
| tree | 6200d4ec82cda3f7fe4d15dfc939ef268e670797 /app | |
| parent | 8adf5395bd4a6b81ddc96935bbbf441cca1b4259 (diff) | |
| parent | 22eb788161718adb48d2b8caa49f189610f78baf (diff) | |
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
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/shared/milestones/_sidebar.html.haml | 4 | ||||
| -rw-r--r-- | app/views/shared/milestones/_top.html.haml | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/views/shared/milestones/_sidebar.html.haml b/app/views/shared/milestones/_sidebar.html.haml index 95138af3950..becd1c4884e 100644 --- a/app/views/shared/milestones/_sidebar.html.haml +++ b/app/views/shared/milestones/_sidebar.html.haml @@ -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 diff --git a/app/views/shared/milestones/_top.html.haml b/app/views/shared/milestones/_top.html.haml index ee0e35cedc6..320e3788a0f 100644 --- a/app/views/shared/milestones/_top.html.haml +++ b/app/views/shared/milestones/_top.html.haml @@ -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 |