root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot 2024-06-13 03:17:04 +00:00
parent 0a8e9f8e1f
commit 4702dc3355
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
db/docs/subscription_user_add_on_assignments.yml
View File

@ -8,4 +8,12 @@ feature_categories:
classes:
- GitlabSubscriptions::UserAddOnAssignment
gitlab_schema: gitlab_main_cell
sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/461396
desired_sharding_key:
organization_id:
references: organizations
backfill_via:
parent:
foreign_key: add_on_purchase_id
table: subscription_add_on_purchases
sharding_key: organization_id
belongs_to: add_on_purchase

2
doc/user/application_security/policies/scan-result-policies.md
View File

@ -245,7 +245,7 @@ The settings set in the policy overwrite settings in the project.
## `fallback_behavior`
> - The `fallback_behavior` field was [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/451784) in GitLab 16.11 [with a flag](../../../administration/feature_flags.md) named `security_scan_result_policies_unblock_fail_open_approval_rules`. Disabled by default.
> - The `fallback_behavior` field was [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/451784) in GitLab 17.0 [with a flag](../../../administration/feature_flags.md) named `security_scan_result_policies_unblock_fail_open_approval_rules`. Disabled by default.
> - The `fallback_behavior` field was [enabled on GitLab.com, self-managed, and GitLab Dedicated](https://gitlab.com/groups/gitlab-org/-/epics/10816) in GitLab 17.0.
FLAG: