diff --git a/doc/user/application_security/policies/merge_request_approval_policies.md b/doc/user/application_security/policies/merge_request_approval_policies.md index 4f6cc96514b72a0c54ffe69c6fc14bb2a2041dfa..824c9e523a291f1ce9f1cab398346bfcc556cf93 100644 --- a/doc/user/application_security/policies/merge_request_approval_policies.md +++ b/doc/user/application_security/policies/merge_request_approval_policies.md @@ -441,8 +441,9 @@ the bot message is sent as long as at least one of those policies has the `send_ {{< history >}} -- [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/15552) in GitLab 17.8 [with a flag](../../../administration/feature_flags/_index.md) named `security_policy_approval_warn_mode`. Disabled by default +- [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/15552) in GitLab 17.8 [with a feature flag](../../../administration/feature_flags/_index.md) named `security_policy_approval_warn_mode`. Disabled by default - [Enabled on GitLab.com, GitLab Self-Managed, and GitLab Dedicated](https://gitlab.com/gitlab-org/gitlab/-/issues/505352) in GitLab 18.6. +- License scanning support was [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/579664) in GitLab 18.7 [with a feature flag](../../../administration/feature_flags/_index.md) named `security_policy_warn_mode_license_scanning`. Enabled by default {{< /history >}} @@ -494,19 +495,6 @@ approval_policy: enabled: true ``` -### Supported rule types - -Warn mode supports the following rule types: - -- `scan_finding`: For security scan results -- `any_merge_request`: For general merge request conditions - -{{< alert type="note" >}} - -The `license_finding` rule type is not supported with warn mode enforcement. - -{{< /alert >}} - ## `approval_settings` {{< history >}} diff --git a/ee/config/feature_flags/beta/security_policy_warn_mode_license_scanning.yml b/ee/config/feature_flags/beta/security_policy_warn_mode_license_scanning.yml index 4cad64082650c8c8430ce095177c2065b2181bd2..0817a0fb462dd469c9df5c38f88449a9fce1d27a 100644 --- a/ee/config/feature_flags/beta/security_policy_warn_mode_license_scanning.yml +++ b/ee/config/feature_flags/beta/security_policy_warn_mode_license_scanning.yml @@ -6,4 +6,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/579664 milestone: '18.7' group: group::security policies type: beta -default_enabled: false +default_enabled: true