diff --git a/doc/user/application_security/vulnerability_report/_index.md b/doc/user/application_security/vulnerability_report/_index.md index 002907bd0130b770c323b3c0c282eefbca5d6df3..fd2f89f75119ceafc1440eb5a338bb1e756e7e8e 100644 --- a/doc/user/application_security/vulnerability_report/_index.md +++ b/doc/user/application_security/vulnerability_report/_index.md @@ -302,6 +302,7 @@ refreshed. {{< history >}} - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/16157) in GitLab 17.9 [with a flag](../../../administration/feature_flags.md) named `vulnerability_severity_override`. Disabled by default. +- [Enabled on GitLab.com, GitLab Self-Managed, and GitLab Dedicated](https://issue-link) in GitLab 17.10. {{< /history >}} @@ -309,7 +310,6 @@ refreshed. The availability of this feature is controlled by a feature flag. For more information, see the history. -This feature is available for testing, but not ready for production use. {{< /alert >}} diff --git a/ee/app/controllers/groups/security/vulnerabilities_controller.rb b/ee/app/controllers/groups/security/vulnerabilities_controller.rb index 81e218570ab9fff39a6fff33bde0a660c39c2f26..e12cdd3a299ed28dacb483a8edb8a6b97eaa699b 100644 --- a/ee/app/controllers/groups/security/vulnerabilities_controller.rb +++ b/ee/app/controllers/groups/security/vulnerabilities_controller.rb @@ -19,7 +19,7 @@ class VulnerabilitiesController < Groups::ApplicationController push_frontend_feature_flag(:vulnerability_report_vr_filter, @group, type: :beta) push_frontend_feature_flag(:vulnerability_report_filtered_search_v2, @group, type: :wip) push_frontend_feature_flag(:enhanced_vulnerability_bulk_actions, @group, type: :wip) - push_frontend_feature_flag(:vulnerability_severity_override, @group.root_ancestor, type: :wip) + push_frontend_feature_flag(:vulnerability_severity_override, @group.root_ancestor, type: :beta) push_frontend_feature_flag(:existing_jira_issue_attachment_from_vulnerability_bulk_action, @project, type: :wip) push_frontend_ability(ability: :resolve_vulnerability_with_ai, resource: @group, user: current_user) push_frontend_feature_flag(:vulnerability_report_type_scanner_filter, @group, type: :gitlab_com_derisk) diff --git a/ee/app/controllers/projects/security/vulnerability_report_controller.rb b/ee/app/controllers/projects/security/vulnerability_report_controller.rb index 7201b012588f9142bc92c7ed8758717dfd3bf74c..0bde8d54c25d0afe3c1323640942dd5b2bc9de6b 100644 --- a/ee/app/controllers/projects/security/vulnerability_report_controller.rb +++ b/ee/app/controllers/projects/security/vulnerability_report_controller.rb @@ -12,7 +12,7 @@ class VulnerabilityReportController < Projects::ApplicationController push_frontend_feature_flag(:vulnerability_report_vr_filter, @project.group, type: :beta) push_frontend_feature_flag(:vulnerability_report_filtered_search_v2, @project, type: :wip) push_frontend_feature_flag(:enhanced_vulnerability_bulk_actions, @project, type: :wip) - push_frontend_feature_flag(:vulnerability_severity_override, @project.root_ancestor, type: :wip) + push_frontend_feature_flag(:vulnerability_severity_override, @project.root_ancestor, type: :beta) push_frontend_feature_flag(:existing_jira_issue_attachment_from_vulnerability_bulk_action, @project, type: :wip) push_frontend_feature_flag(:new_issue_attachment_from_vulnerability_bulk_action, @project, type: :wip) push_frontend_feature_flag(:vulnerability_report_type_scanner_filter, @project, type: :gitlab_com_derisk) diff --git a/ee/app/controllers/security/vulnerabilities_controller.rb b/ee/app/controllers/security/vulnerabilities_controller.rb index 3a172a3aa417de069d974323e50f2e1219406921..b5afaf728ce8153d7c54d73bb3d2718c89164850 100644 --- a/ee/app/controllers/security/vulnerabilities_controller.rb +++ b/ee/app/controllers/security/vulnerabilities_controller.rb @@ -13,7 +13,7 @@ class VulnerabilitiesController < ::Security::ApplicationController push_frontend_feature_flag(:vulnerability_report_vr_badge, current_user, type: :beta) push_frontend_feature_flag(:vulnerability_report_vr_filter, current_user, type: :beta) push_frontend_feature_flag(:enhanced_vulnerability_bulk_actions, current_user, type: :wip) - push_frontend_feature_flag(:vulnerability_severity_override, current_user, type: :wip) + push_frontend_feature_flag(:vulnerability_severity_override, current_user, type: :beta) push_frontend_feature_flag(:existing_jira_issue_attachment_from_vulnerability_bulk_action, current_user, type: :wip diff --git a/ee/config/feature_flags/wip/vulnerability_severity_override.yml b/ee/config/feature_flags/beta/vulnerability_severity_override.yml similarity index 70% rename from ee/config/feature_flags/wip/vulnerability_severity_override.yml rename to ee/config/feature_flags/beta/vulnerability_severity_override.yml index 957546def85ddc2d633e3e08df9cb702a7ce5751..c627cebd411bbe9aabdda0d55a5fedcdcd3cc5be 100644 --- a/ee/config/feature_flags/wip/vulnerability_severity_override.yml +++ b/ee/config/feature_flags/beta/vulnerability_severity_override.yml @@ -2,8 +2,8 @@ name: vulnerability_severity_override feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/512889 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/177685 -rollout_issue_url: +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/516940 milestone: '17.9' group: group::security platform management -type: wip -default_enabled: false +type: beta +default_enabled: true