diff --git a/doc/ci/variables/index.md b/doc/ci/variables/index.md index 2477c52a270a2a0928e5038302793e9c5f166ad6..f247d9609fed0b6d8f29c2c6f38219c1188b5279 100644 --- a/doc/ci/variables/index.md +++ b/doc/ci/variables/index.md @@ -638,7 +638,7 @@ To disable variable expansion for the variable: ## CI/CD variable precedence -> Scan Execution Policies variable precedence was [changed](https://gitlab.com/gitlab-org/gitlab/-/issues/424028) in GitLab 16.6 [with a flag](../../administration/feature_flags.md) named `security_policies_variables_precedence`. Disabled by default. +> Scan Execution Policies variable precedence was [changed](https://gitlab.com/gitlab-org/gitlab/-/issues/424028) in GitLab 16.7 [with a flag](../../administration/feature_flags.md) named `security_policies_variables_precedence`. Enabled by default. You can use CI/CD variables with the same name in different places, but the values can overwrite each other. The type of variable and where they are defined determines diff --git a/doc/user/application_security/policies/scan-execution-policies.md b/doc/user/application_security/policies/scan-execution-policies.md index 2899bf69478913732f305de43b550752134d1df0..f299a38dff15781cfd06d90ed48edada0e76472f 100644 --- a/doc/user/application_security/policies/scan-execution-policies.md +++ b/doc/user/application_security/policies/scan-execution-policies.md @@ -201,7 +201,7 @@ The keys for a schedule rule are: ## `scan` action type -> - Scan Execution Policies variable precedence was [changed](https://gitlab.com/gitlab-org/gitlab/-/issues/424028) in GitLab 16.6 [with a flag](../../../administration/feature_flags.md) named `security_policies_variables_precedence`. Disabled by default. +> - Scan Execution Policies variable precedence was [changed](https://gitlab.com/gitlab-org/gitlab/-/issues/424028) in GitLab 16.7 [with a flag](../../../administration/feature_flags.md) named `security_policies_variables_precedence`. Enabled by default. > - The `custom` scan action type was [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/126457) in GitLab 16.4 [with a flag](../../../administration/feature_flags.md) named `compliance_pipeline_in_policies`. On GitLab.com, this feature is not available. On self-managed GitLab, by default this feature is not available. To make it available, an administrator can [enable the feature flag](../../../administration/feature_flags.md) named `compliance_pipeline_in_policies`. This action executes the selected `scan` with additional parameters when conditions for at least one diff --git a/ee/config/feature_flags/development/security_policies_variables_precedence.yml b/ee/config/feature_flags/development/security_policies_variables_precedence.yml index 7aa79fc216c5672a7e12552e1f6628034b76ad0f..911e154ad98782004823819e65253cf44c4e6fdd 100644 --- a/ee/config/feature_flags/development/security_policies_variables_precedence.yml +++ b/ee/config/feature_flags/development/security_policies_variables_precedence.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/429661 milestone: '16.7' type: development group: group::security policies -default_enabled: false +default_enabled: true