Skip to content
Snippets Groups Projects
Commit 6e566f5f authored by Hitesh Raghuvanshi's avatar Hitesh Raghuvanshi :two: Committed by Etienne Baqué
Browse files

Removing immediate_delete_subgroup_api feature flag

Removing immediate_delete_subgroup_api feature flag

Changelog: other
EE: true
parent 0a378ea1
No related branches found
No related tags found
1 merge request!109200Resolve "[Feature flag] Cleanup "immediate_delete_subgroup_api""
......@@ -1135,6 +1135,7 @@ curl --request PUT --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab
> - Immediately deleting subgroups was [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/360008) in GitLab 15.3 [with a flag](../administration/feature_flags.md) named `immediate_delete_subgroup_api`. Disabled by default.
> - Immediately deleting subgroups was [enabled on GitLab.com and self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/368276) in GitLab 15.4.
> - Immediately deleting subgroups was [enabled](https://gitlab.com/gitlab-org/gitlab/-/issues/368276) by default in GitLab 15.4.
> - The flag `immediate_delete_subgroup_api` for immediately deleting subgroups was [removed](https://gitlab.com/gitlab-org/gitlab/-/issues/374069) in GitLab 15.9.
Only available to group owners and administrators.
......
---
name: immediate_delete_subgroup_api
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/92508
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/368276
milestone: '15.3'
type: development
group: group::workspace
default_enabled: true
......@@ -98,8 +98,7 @@ def immediately_delete_subgroup_error(group)
def delete_group(group)
return super unless group.adjourned_deletion?
if ::Feature.enabled?(:immediate_delete_subgroup_api, group.parent) &&
::Gitlab::Utils.to_boolean(params[:permanently_remove])
if ::Gitlab::Utils.to_boolean(params[:permanently_remove])
error = immediately_delete_subgroup_error(group)
return super if error.nil?
......
......@@ -1075,17 +1075,7 @@
context 'when the full_path param is passed and it matches the full path of subgroup' do
let(:params) { { permanently_remove: true, full_path: subgroup.full_path } }
context 'when feature flag is enabled for the group' do
it_behaves_like 'immediately enqueues the job to delete the group'
end
context 'when feature flag is disabled for the group' do
before do
stub_feature_flags(immediate_delete_subgroup_api: false)
end
it_behaves_like 'does not immediately enqueues the job to delete the group', 'Group has been already marked for deletion'
end
it_behaves_like 'immediately enqueues the job to delete the group'
end
end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment