Commit 705b7171 authored by Savas Vedova's avatar Savas Vedova

Merge branch '273791-delete-feature-flag' into 'master'

Remove scan_execution_policy_ui feature flag

See merge request gitlab-org/gitlab!67642
parents 64f31cb5 e456b564
......@@ -33,7 +33,7 @@ export default {
return POLICY_KIND_OPTIONS[this.policyType].component;
},
shouldAllowPolicyTypeSelection() {
return !this.existingPolicy && this.glFeatures.scanExecutionPolicyUi;
return !this.existingPolicy && this.glFeatures.securityOrchestrationPoliciesConfiguration;
},
shouldShowEnvironmentPicker() {
return POLICY_KIND_OPTIONS[this.policyType].shouldShowEnvironmentPicker;
......
......@@ -7,7 +7,7 @@ module Projects
before_action :authorize_read_threat_monitoring!
before_action do
push_frontend_feature_flag(:scan_execution_policy_ui, @project)
push_frontend_feature_flag(:security_orchestration_policies_configuration, @project)
end
feature_category :not_owned
......
---
name: scan_execution_policy_ui
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/63585
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/273791
milestone: '14.0'
type: development
group: group::container security
default_enabled: false
......@@ -64,9 +64,9 @@ describe('PolicyEditor component', () => {
});
});
describe('with "scanExecutionPolicyUi" feature flag enabled', () => {
describe('with "securityOrchestrationPoliciesConfiguration" feature flag enabled', () => {
beforeEach(() => {
factory({ provide: { glFeatures: { scanExecutionPolicyUi: true } } });
factory({ provide: { glFeatures: { securityOrchestrationPoliciesConfiguration: true } } });
});
it('renders the form select', () => {
......
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