Add latest changes from gitlab-org/gitlab@13-1-stable-ee

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