Commit 23b4f600 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch '349014-corpus-management-ui-flag' into 'master'

Migrate corpus management UI to use seperate feature flag

See merge request gitlab-org/gitlab!77279
parents e809d9ff e661e062
...@@ -254,7 +254,7 @@ export const securityFeatures = [ ...@@ -254,7 +254,7 @@ export const securityFeatures = [
helpPath: COVERAGE_FUZZING_HELP_PATH, helpPath: COVERAGE_FUZZING_HELP_PATH,
configurationHelpPath: COVERAGE_FUZZING_CONFIG_HELP_PATH, configurationHelpPath: COVERAGE_FUZZING_CONFIG_HELP_PATH,
type: REPORT_TYPE_COVERAGE_FUZZING, type: REPORT_TYPE_COVERAGE_FUZZING,
secondary: gon?.features?.corpusManagement secondary: gon?.features?.corpusManagementUi
? { ? {
type: REPORT_TYPE_CORPUS_MANAGEMENT, type: REPORT_TYPE_CORPUS_MANAGEMENT,
name: CORPUS_MANAGEMENT_NAME, name: CORPUS_MANAGEMENT_NAME,
......
...@@ -14,7 +14,7 @@ module EE ...@@ -14,7 +14,7 @@ module EE
before_action only: [:show] do before_action only: [:show] do
push_frontend_feature_flag(:security_auto_fix, project, default_enabled: false) push_frontend_feature_flag(:security_auto_fix, project, default_enabled: false)
push_frontend_feature_flag(:corpus_management, project, default_enabled: :yaml) push_frontend_feature_flag(:corpus_management_ui, project, default_enabled: :yaml)
push_frontend_feature_flag(:secure_vulnerability_training, project, default_enabled: :yaml) push_frontend_feature_flag(:secure_vulnerability_training, project, default_enabled: :yaml)
end end
......
...@@ -6,7 +6,7 @@ module Projects ...@@ -6,7 +6,7 @@ module Projects
include SecurityAndCompliancePermissions include SecurityAndCompliancePermissions
before_action do before_action do
render_404 unless Feature.enabled?(:corpus_management, @project, default_enabled: :yaml) render_404 unless Feature.enabled?(:corpus_management_ui, @project, default_enabled: :yaml)
authorize_read_coverage_fuzzing! authorize_read_coverage_fuzzing!
end end
......
---
name: corpus_management_ui
introduced_by_url:
rollout_issue_url:
milestone: '14.7'
type: development
group: group::dynamic analysis
default_enabled: false
\ No newline at end of file
...@@ -25,7 +25,7 @@ module EE ...@@ -25,7 +25,7 @@ module EE
dast: project_security_configuration_dast_path(project), dast: project_security_configuration_dast_path(project),
dast_profiles: project_security_configuration_dast_scans_path(project), dast_profiles: project_security_configuration_dast_scans_path(project),
api_fuzzing: project_security_configuration_api_fuzzing_path(project), api_fuzzing: project_security_configuration_api_fuzzing_path(project),
corpus_management: (project_security_configuration_corpus_management_path(project) if ::Feature.enabled?(:corpus_management, project, default_enabled: :yaml)) corpus_management: (project_security_configuration_corpus_management_path(project) if ::Feature.enabled?(:corpus_management_ui, project, default_enabled: :yaml))
}.merge(super) }.merge(super)
end end
end end
......
...@@ -188,7 +188,7 @@ RSpec.describe Projects::Security::ConfigurationController do ...@@ -188,7 +188,7 @@ RSpec.describe Projects::Security::ConfigurationController do
before do before do
stub_feature_flags(security_auto_fix: false) stub_feature_flags(security_auto_fix: false)
stub_feature_flags(corpus_management: false) stub_feature_flags(corpus_management_ui: false)
request request
end end
......
...@@ -82,7 +82,7 @@ RSpec.describe ::Gitlab::Security::ScanConfiguration do ...@@ -82,7 +82,7 @@ RSpec.describe ::Gitlab::Security::ScanConfiguration do
context 'when feature flag is disabled' do context 'when feature flag is disabled' do
before do before do
stub_feature_flags(corpus_management: false) stub_feature_flags(corpus_management_ui: false)
end end
it { is_expected.to be_nil } it { is_expected.to be_nil }
......
...@@ -14,7 +14,7 @@ RSpec.describe Projects::Security::ConfigurationPresenter do ...@@ -14,7 +14,7 @@ RSpec.describe Projects::Security::ConfigurationPresenter do
before do before do
stub_licensed_features(licensed_scan_types.to_h { |type| [type, true] }) stub_licensed_features(licensed_scan_types.to_h { |type| [type, true] })
stub_feature_flags(corpus_management: false) stub_feature_flags(corpus_management_ui: false)
end end
describe '#to_html_data_attribute' do describe '#to_html_data_attribute' 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