Remove expiration_policy feature flag

- remove flag from helper
- adjust tests
- changelog file
parent 6c285a80
......@@ -720,8 +720,7 @@ module ProjectsHelper
end
def settings_container_registry_expiration_policy_available?(project)
Feature.enabled?(:registry_retention_policies_settings, project) &&
Gitlab.config.registry.enabled &&
Gitlab.config.registry.enabled &&
can?(current_user, :destroy_container_image, project)
end
end
---
title: Container Registry tag expiration policy settings
merge_request: 25123
author:
type: added
......@@ -10,7 +10,6 @@ describe 'Project > Settings > CI/CD > Container registry tag expiration policy'
before do
sign_in(user)
stub_container_registry_config(enabled: true)
stub_feature_flags(registry_retention_policies_settings: true)
end
context 'as owner' do
......@@ -63,15 +62,4 @@ describe 'Project > Settings > CI/CD > Container registry tag expiration policy'
expect(page).not_to have_selector('#js-registry-policies')
end
end
context 'when feature flag is disabled' do
before do
stub_feature_flags(registry_retention_policies_settings: false)
visit project_settings_ci_cd_path(project)
end
it 'does not exists' do
expect(page).not_to have_selector('#js-registry-policies')
end
end
end
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