Commit c92b25d7 authored by Alex Kalderimis's avatar Alex Kalderimis

Merge branch 'dblessing_remove_group_project_api_preload_plans_feature_flag' into 'master'

Remove feature flag for Group Projects API Plan Preloading

See merge request gitlab-org/gitlab!81324
parents cae1331b 79469788
---
name: group_project_api_preload_plans
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/77538
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350176
milestone: '14.7'
type: development
group: group::authentication and authorization
default_enabled: false
...@@ -4,7 +4,6 @@ module EE ...@@ -4,7 +4,6 @@ module EE
module Preloaders module Preloaders
module SingleHierarchyProjectGroupPlansPreloader module SingleHierarchyProjectGroupPlansPreloader
def execute def execute
return unless ::Feature.enabled?(:group_project_api_preload_plans, default_enabled: :yaml)
return unless ::Gitlab::CurrentSettings.should_check_namespace_plan? return unless ::Gitlab::CurrentSettings.should_check_namespace_plan?
return unless project = projects.take return unless project = projects.take
......
...@@ -654,20 +654,6 @@ RSpec.describe API::Groups do ...@@ -654,20 +654,6 @@ RSpec.describe API::Groups do
expect(response).to have_gitlab_http_status(:ok) expect(response).to have_gitlab_http_status(:ok)
end end
context 'when the feature flag is disabled' do
before do
stub_feature_flags(group_project_api_preload_plans: false)
end
it 'does not preload plans' do
expect(Plan).to receive(:hosted_plans_for_namespaces).at_least(:twice).and_call_original
get api("/groups/#{group.id}/projects", user), params: { include_subgroups: true }
expect(response).to have_gitlab_http_status(:ok)
end
end
end end
context 'when there are no projects' do context 'when there are no projects' do
......
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