From 4702dc33551b69aa7c6f7c02dfd10aec8aee0c75 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 13 Jun 2024 03:17:04 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- db/docs/subscription_user_add_on_assignments.yml | 10 +++++++++- .../policies/scan-result-policies.md | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/db/docs/subscription_user_add_on_assignments.yml b/db/docs/subscription_user_add_on_assignments.yml index 38006808d3e..65d59135f88 100644 --- a/db/docs/subscription_user_add_on_assignments.yml +++ b/db/docs/subscription_user_add_on_assignments.yml @@ -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 diff --git a/doc/user/application_security/policies/scan-result-policies.md b/doc/user/application_security/policies/scan-result-policies.md index 10b5bf4070d..467fe885e85 100644 --- a/doc/user/application_security/policies/scan-result-policies.md +++ b/doc/user/application_security/policies/scan-result-policies.md @@ -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: