From 669c6e28839c1f28762207898aa61aa3a361db8c Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Sat, 14 Jun 2025 03:09:47 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../policies/merge_request_approval_policies.md | 2 +- locale/gitlab.pot | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) 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 373254ea155..4049c136d36 100644 --- a/doc/user/application_security/policies/merge_request_approval_policies.md +++ b/doc/user/application_security/policies/merge_request_approval_policies.md @@ -253,7 +253,7 @@ This rule enforces the defined actions based on security scan findings. - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/8092) in GitLab 15.9 [with a flag](../../../administration/feature_flags.md) named `license_scanning_policies`. - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/397644) in GitLab 15.11. Feature flag `license_scanning_policies` removed. - The `branch_exceptions` field was [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/418741) in GitLab 16.3 [with a flag](../../../administration/feature_flags.md) named `security_policies_branch_exceptions`. Enabled by default. [Generally available](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/133753) in GitLab 16.5. Feature flag removed. -- The `licenses` field was [introduced](https://gitlab.com/groups/gitlab-org/-/epics/10203) in GitLab 17.11 [with a flag](../../../administration/feature_flags.md) named `exclude_license_packages`. Enabled by default. +- The `licenses` field was [introduced](https://gitlab.com/groups/gitlab-org/-/epics/10203) in GitLab 17.11 [with a flag](../../../administration/feature_flags.md) named `exclude_license_packages`. Feature flag removed. {{< /history >}} diff --git a/locale/gitlab.pot b/locale/gitlab.pot index b98e90ba7ae..9b17c3bbeb6 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -54245,9 +54245,6 @@ msgstr "" msgid "ScanResultPolicy|License is:" msgstr "" -msgid "ScanResultPolicy|License scanning allows only one criteria: Status" -msgstr "" - msgid "ScanResultPolicy|License status" msgstr ""