diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /app/helpers/numbers_helper.rb | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
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 |