diff --git a/ee/app/controllers/concerns/ee/groups/params.rb b/ee/app/controllers/concerns/ee/groups/params.rb index f366b8f3d2841ce73884b42cd8af0ff9ebfd5448..af5611d12a058a2bc9798fec331cbee274653189 100644 --- a/ee/app/controllers/concerns/ee/groups/params.rb +++ b/ee/app/controllers/concerns/ee/groups/params.rb @@ -123,7 +123,7 @@ def current_group end def enterprise_bypass_placeholders_allowed? - ::Feature.enabled?(:importer_user_mapping_allow_bypass_of_confirmation, current_group) && + ::Feature.enabled?(:group_owner_placeholder_confirmation_bypass, current_group) && current_group&.domain_verification_available? end end diff --git a/ee/config/feature_flags/wip/group_owner_placeholder_confirmation_bypass.yml b/ee/config/feature_flags/wip/group_owner_placeholder_confirmation_bypass.yml new file mode 100644 index 0000000000000000000000000000000000000000..d4ab1fd2dd0fc3c306778c8190d54c349a6b0e88 --- /dev/null +++ b/ee/config/feature_flags/wip/group_owner_placeholder_confirmation_bypass.yml @@ -0,0 +1,10 @@ +--- +name: group_owner_placeholder_confirmation_bypass +description: 'Enables ability for owners of top-level enterprise groups to skip placeholder user confirmation during direct transfer' +feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/544024 +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/194389 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/548946 +milestone: '18.1' +group: group::import +type: wip +default_enabled: false diff --git a/ee/spec/requests/groups_controller_spec.rb b/ee/spec/requests/groups_controller_spec.rb index 331c94666cd2596fc17ccbe189b1b42d7b2ac0b7..ea151a1488e4e00580ec11cb4a9f99b006cd71b5 100644 --- a/ee/spec/requests/groups_controller_spec.rb +++ b/ee/spec/requests/groups_controller_spec.rb @@ -690,9 +690,9 @@ end end - context 'when the importer_user_mapping_allow_bypass_of_confirmation feature flag is disabled' do + context 'when the group_owner_placeholder_confirmation_bypass feature flag is disabled' do before do - stub_feature_flags(importer_user_mapping_allow_bypass_of_confirmation: false) + stub_feature_flags(group_owner_placeholder_confirmation_bypass: false) end it 'does not change the setting' do