diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-29 21:09:22 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-29 21:09:22 +0000 |
commit | 27d314277bfe7fffec215efa9b1833a23bb82940 (patch) | |
tree | 898c606409718e70579beea62174624f84e28629 /app/helpers | |
parent | 6b9d3a4e8351e662c4586b24bb152de78ae9e3bf (diff) | |
download | gitlab-ce-27d314277bfe7fffec215efa9b1833a23bb82940.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/milestones_helper.rb | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/app/helpers/milestones_helper.rb b/app/helpers/milestones_helper.rb index 494c0bee8b8..b12b39073ef 100644 --- a/app/helpers/milestones_helper.rb +++ b/app/helpers/milestones_helper.rb @@ -26,7 +26,7 @@ module MilestonesHelper end end - def milestones_issues_path(opts = {}) + def milestones_label_path(opts = {}) if @project project_issues_path(@project, opts) elsif @group @@ -281,26 +281,6 @@ module MilestonesHelper can?(current_user, :admin_milestone, @project.group) end end - - def display_issues_count_warning? - milestone_visible_issues_count > Milestone::DISPLAY_ISSUES_LIMIT - end - - def milestone_issues_count_message - total_count = milestone_visible_issues_count - limit = Milestone::DISPLAY_ISSUES_LIMIT - - message = _('Showing %{limit} of %{total_count} issues. ') % { limit: limit, total_count: total_count } - message += link_to(_('View all issues'), milestones_issues_path) - - message.html_safe - end - - private - - def milestone_visible_issues_count - @milestone_visible_issues_count ||= @milestone.issues_visible_to_user(current_user).size - end end MilestonesHelper.prepend_if_ee('EE::MilestonesHelper') |