Commit 1e8f889d authored by Andreas Brandl's avatar Andreas Brandl

Merge branch 'ab/ff-kaminari-limited-counts' into 'master'

Update feature flag definition

See merge request gitlab-org/gitlab!43428
parents f458b970 d65d1ae1
--- ---
name: api_kaminari_count_with_limit name: api_kaminari_count_with_limit
introduced_by_url: introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/23931
rollout_issue_url: rollout_issue_url:
group: group: group::ecosystem
type: development type: ops
default_enabled: false default_enabled: false
...@@ -27,7 +27,7 @@ module Gitlab ...@@ -27,7 +27,7 @@ module Gitlab
end end
return pagination_data unless pagination_data.is_a?(ActiveRecord::Relation) return pagination_data unless pagination_data.is_a?(ActiveRecord::Relation)
return pagination_data unless Feature.enabled?(:api_kaminari_count_with_limit) return pagination_data unless Feature.enabled?(:api_kaminari_count_with_limit, type: :ops)
limited_total_count = pagination_data.total_count_with_limit limited_total_count = pagination_data.total_count_with_limit
if limited_total_count > Kaminari::ActiveRecordRelationMethods::MAX_COUNT_LIMIT if limited_total_count > Kaminari::ActiveRecordRelationMethods::MAX_COUNT_LIMIT
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment