diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-29 12:08:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-29 12:08:06 +0300 |
commit | 8b78957052d55ee6a73630082a870278b052b936 (patch) | |
tree | d1dc2415a687f795802c1d1c5079a53e09228cab /app/helpers/numbers_helper.rb | |
parent | 2958635884b1dc5c8c01b5f00f0b7b7359556c37 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/numbers_helper.rb')
-rw-r--r-- | app/helpers/numbers_helper.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/helpers/numbers_helper.rb b/app/helpers/numbers_helper.rb index 3c0b11c4d32..38d3f90dd55 100644 --- a/app/helpers/numbers_helper.rb +++ b/app/helpers/numbers_helper.rb @@ -1,15 +1,14 @@ # frozen_string_literal: true module NumbersHelper - # rubocop: disable CodeReuse/ActiveRecord def limited_counter_with_delimiter(resource, **options) limit = options.fetch(:limit, 1000).to_i - count = resource.limit(limit + 1).count(:all) + count = resource.page.total_count_with_limit(:all, limit: limit) + if count > limit number_with_delimiter(count - 1, options) + '+' else number_with_delimiter(count, options) end end - # rubocop: enable CodeReuse/ActiveRecord end |