diff --git a/config/feature_flags/ops/api_kaminari_count_with_limit.yml b/config/feature_flags/ops/api_kaminari_count_with_limit.yml index a55e3e677102317bc5bd2059c10e01d654123530..c11c6758189b463f7b5d288f8356a9dd2658f0e3 100644 --- a/config/feature_flags/ops/api_kaminari_count_with_limit.yml +++ b/config/feature_flags/ops/api_kaminari_count_with_limit.yml @@ -1,8 +1,8 @@ --- name: api_kaminari_count_with_limit introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/23931 -rollout_issue_url: +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353077 milestone: '11.8' type: ops group: group::integrations -default_enabled: false +default_enabled: true diff --git a/doc/api/features.md b/doc/api/features.md index 30efacb1d005114e81aa455785a50847e5fa6353..593e4adedd7f2760fa32438815a63a5bdba59779 100644 --- a/doc/api/features.md +++ b/doc/api/features.md @@ -95,7 +95,7 @@ Example response: "milestone": "11.8", "type": "ops", "group": "group::ecosystem", - "default_enabled": false + "default_enabled": true }, { "name": "marginalia", diff --git a/lib/gitlab/pagination/offset_pagination.rb b/lib/gitlab/pagination/offset_pagination.rb index 8cb959769eeb7940d2575c81f0cd504c40941b35..fca75d1fe019350244e6b3a743ef47e1329c6d94 100644 --- a/lib/gitlab/pagination/offset_pagination.rb +++ b/lib/gitlab/pagination/offset_pagination.rb @@ -27,7 +27,7 @@ def paginate_with_limit_optimization(relation) end return pagination_data unless pagination_data.is_a?(ActiveRecord::Relation) - return pagination_data unless Feature.enabled?(:api_kaminari_count_with_limit, type: :ops) + return pagination_data unless Feature.enabled?(:api_kaminari_count_with_limit, type: :ops, default_enabled: :yaml) limited_total_count = pagination_data.total_count_with_limit if limited_total_count > Kaminari::ActiveRecordRelationMethods::MAX_COUNT_LIMIT