From f79b154180c1e5fdb240e02f3b593b4865b42d4e Mon Sep 17 00:00:00 2001 From: Sashi Kumar Kumaresan <skumar@gitlab.com> Date: Mon, 15 Jan 2024 17:19:28 +0000 Subject: [PATCH] Enable security_policies_policy_scope by default This change enables security_policies_policy_scope feature flag by default. EE: true Changelog: added --- .../policies/scan-execution-policies.md | 8 ++++---- .../application_security/policies/scan-result-policies.md | 8 ++++---- .../development/security_policies_policy_scope.yml | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/user/application_security/policies/scan-execution-policies.md b/doc/user/application_security/policies/scan-execution-policies.md index 92817b70b6c1d..9a6f758187623 100644 --- a/doc/user/application_security/policies/scan-execution-policies.md +++ b/doc/user/application_security/policies/scan-execution-policies.md @@ -402,13 +402,13 @@ In this example a `test job` is injected into the `test` stage of the pipeline, ### Security policy scopes -> The `policy_scope` field was [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/135398) in GitLab 16.7 [with a flag](../../../administration/feature_flags.md) named `security_policies_policy_scope`. Disabled by default. +> The `policy_scope` field was [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/135398) in GitLab 16.7 [with a flag](../../../administration/feature_flags.md) named `security_policies_policy_scope`. FLAG: -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) +On self-managed GitLab, by default this feature is available. To hide the feature, +an administrator can [disable the feature flag](../../../administration/feature_flags.md) named `security_policies_policy_scope`. -On GitLab.com, this feature is not available. +On GitLab.com, this feature is available. Security policy enforcement depends first on establishing a link between the group, subgroup, or project on which you want to enforce policies, and the security policy project that contains the diff --git a/doc/user/application_security/policies/scan-result-policies.md b/doc/user/application_security/policies/scan-result-policies.md index aa80d08d4c560..7ddf4a52f0173 100644 --- a/doc/user/application_security/policies/scan-result-policies.md +++ b/doc/user/application_security/policies/scan-result-policies.md @@ -369,13 +369,13 @@ We have identified in [epic 11020](https://gitlab.com/groups/gitlab-org/-/epics/ ### Security policy scopes -> The `policy_scope` field was [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/135398) in GitLab 16.7 [with a flag](../../../administration/feature_flags.md) named `security_policies_policy_scope`. Disabled by default. +> The `policy_scope` field was [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/135398) in GitLab 16.7 [with a flag](../../../administration/feature_flags.md) named `security_policies_policy_scope`. FLAG: -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) +On self-managed GitLab, by default this feature is available. To hide the feature, +an administrator can [disable the feature flag](../../../administration/feature_flags.md) named `security_policies_policy_scope`. -On GitLab.com, this feature is not available. +On GitLab.com, this feature is available. Security policy enforcement depends first on establishing a link between the group, subgroup, or project on which you want to enforce policies, and the security policy project that contains the diff --git a/ee/config/feature_flags/development/security_policies_policy_scope.yml b/ee/config/feature_flags/development/security_policies_policy_scope.yml index d78841e879c68..bc8c2286b1100 100644 --- a/ee/config/feature_flags/development/security_policies_policy_scope.yml +++ b/ee/config/feature_flags/development/security_policies_policy_scope.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/429912 milestone: '16.6' type: development group: group::security policies -default_enabled: false +default_enabled: true -- GitLab