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/helpers/milestones_helper.rb | |
parent | 1c25ac983cd1e4335faa1ec4922c314d6321e224 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/milestones_helper.rb')
-rw-r--r-- | app/helpers/milestones_helper.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/helpers/milestones_helper.rb b/app/helpers/milestones_helper.rb index a723269ea0e..da6a0e38c44 100644 --- a/app/helpers/milestones_helper.rb +++ b/app/helpers/milestones_helper.rb @@ -92,12 +92,12 @@ module MilestonesHelper end def milestone_progress_tooltip_text(milestone) - has_issues = milestone.total_issues_count(current_user) > 0 + has_issues = milestone.total_issues_count > 0 if has_issues [ _('Progress'), - _("%{percent}%% complete") % { percent: milestone.percent_complete(current_user) } + _("%{percent}%% complete") % { percent: milestone.percent_complete } ].join('<br />') else _('Progress') @@ -107,7 +107,7 @@ module MilestonesHelper def milestone_progress_bar(milestone) options = { class: 'progress-bar bg-success', - style: "width: #{milestone.percent_complete(current_user)}%;" + style: "width: #{milestone.percent_complete}%;" } content_tag :div, class: 'progress' do @@ -151,9 +151,9 @@ module MilestonesHelper end def milestone_issues_tooltip_text(milestone) - total = milestone.total_issues_count(current_user) - opened = milestone.opened_issues_count(current_user) - closed = milestone.closed_issues_count(current_user) + total = milestone.total_issues_count + opened = milestone.opened_issues_count + closed = milestone.closed_issues_count return _("Issues") if total.zero? |