diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-07 03:08:25 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-07 03:08:25 +0300 |
commit | 3e31cffa203fd718381421e8035f7161a9f0338e (patch) | |
tree | 5d37928bebf08ddc931efe04a85d66217c8a0cea /app/views/shared | |
parent | 1c25ac983cd1e4335faa1ec4922c314d6321e224 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/shared')
-rw-r--r-- | app/views/shared/milestones/_milestone.html.haml | 4 | ||||
-rw-r--r-- | app/views/shared/milestones/_sidebar.html.haml | 4 | ||||
-rw-r--r-- | app/views/shared/milestones/_top.html.haml | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/app/views/shared/milestones/_milestone.html.haml b/app/views/shared/milestones/_milestone.html.haml index 6e50b31fd71..451c2c2ba10 100644 --- a/app/views/shared/milestones/_milestone.html.haml +++ b/app/views/shared/milestones/_milestone.html.haml @@ -42,11 +42,11 @@ .col-sm-4.milestone-progress = milestone_progress_bar(milestone) - = link_to pluralize(milestone.total_issues_count(current_user), 'Issue'), issues_path + = link_to pluralize(milestone.total_issues_count, 'Issue'), issues_path - if milestone.merge_requests_enabled? · = link_to pluralize(milestone.merge_requests_visible_to_user(current_user).size, 'Merge Request'), merge_requests_path - .float-lg-right.light #{milestone.percent_complete(current_user)}% complete + .float-lg-right.light #{milestone.percent_complete}% complete .col-sm-2 .milestone-actions.d-flex.justify-content-sm-start.justify-content-md-end - if @project diff --git a/app/views/shared/milestones/_sidebar.html.haml b/app/views/shared/milestones/_sidebar.html.haml index a6fb8e6d4fc..aa9c4be1cc1 100644 --- a/app/views/shared/milestones/_sidebar.html.haml +++ b/app/views/shared/milestones/_sidebar.html.haml @@ -7,7 +7,7 @@ %a.gutter-toggle.float-right.js-sidebar-toggle.has-tooltip{ role: "button", href: "#", "aria-label" => "Toggle sidebar", title: sidebar_gutter_tooltip_text, data: { container: 'body', placement: 'left', boundary: 'viewport' } } = sidebar_gutter_toggle_icon .title.hide-collapsed - %strong.bold== #{milestone.percent_complete(current_user)}% + %strong.bold== #{milestone.percent_complete}% %span.hide-collapsed complete .value.hide-collapsed @@ -15,7 +15,7 @@ .block.milestone-progress.hide-expanded .sidebar-collapsed-icon.has-tooltip{ title: milestone_progress_tooltip_text(milestone), data: { container: 'body', html: 'true', placement: 'left', boundary: 'viewport' } } - %span== #{milestone.percent_complete(current_user)}% + %span== #{milestone.percent_complete}% = milestone_progress_bar(milestone) .block.start_date.hide-collapsed diff --git a/app/views/shared/milestones/_top.html.haml b/app/views/shared/milestones/_top.html.haml index 12575b30a6c..8d911d4247e 100644 --- a/app/views/shared/milestones/_top.html.haml +++ b/app/views/shared/milestones/_top.html.haml @@ -8,7 +8,7 @@ = render 'shared/milestones/deprecation_message' if is_dynamic_milestone = render 'shared/milestones/description', milestone: milestone -- if milestone.complete?(current_user) && milestone.active? +- if milestone.complete? && milestone.active? .alert.alert-success.prepend-top-default %span = _('All issues for this milestone are closed.') |