Add latest changes from gitlab-org/gitlab@master

5 files changed, 34 insertions, 0 deletions

diff --git a/db/migrate/20231213170159_add_remove_project_to_member_roles.rb b/db/migrate/20231213170159_add_remove_project_to_member_roles.rb
new file mode 100644
index 00000000000..d13777c1df1
--- /dev/null
+++ b/db/migrate/20231213170159_add_remove_project_to_member_roles.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class AddRemoveProjectToMemberRoles < Gitlab::Database::Migration[2.2]
+  milestone '16.8'
+  enable_lock_retries!
+
+  def change
+    add_column :member_roles, :remove_project, :boolean, default: false, null: false
+  end
+end
diff --git a/db/migrate/20231215101640_add_cascading_toggle_security_policies_policy_scope_setting.rb b/db/migrate/20231215101640_add_cascading_toggle_security_policies_policy_scope_setting.rb
new file mode 100644
index 00000000000..9ef0c70173b
--- /dev/null
+++ b/db/migrate/20231215101640_add_cascading_toggle_security_policies_policy_scope_setting.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class AddCascadingToggleSecurityPoliciesPolicyScopeSetting < Gitlab::Database::Migration[2.2]
+  milestone '16.7'
+
+  include Gitlab::Database::MigrationHelpers::CascadingNamespaceSettings
+
+  enable_lock_retries!
+
+  def up
+    add_cascading_namespace_setting :toggle_security_policies_policy_scope, :boolean, default: false, null: false
+  end
+
+  def down
+    remove_cascading_namespace_setting :toggle_security_policies_policy_scope
+  end
+end
diff --git a/db/schema_migrations/20231213170159 b/db/schema_migrations/20231213170159
new file mode 100644
index 00000000000..ff5e6e29a3c
--- /dev/null
+++ b/db/schema_migrations/20231213170159
@@ -0,0 +1 @@
+f73fde4e3e54fa88d8dba9ec3a98b7dfb8332aaf7a76de73baf899292ed751b1
\ No newline at end of file
diff --git a/db/schema_migrations/20231215101640 b/db/schema_migrations/20231215101640
new file mode 100644
index 00000000000..13c883c9e3d
--- /dev/null
+++ b/db/schema_migrations/20231215101640
@@ -0,0 +1 @@
+7bdc5d7aa9f9228aac355e51b1461b7d07083e8e5481ccf3e59c5ec48c9230ab
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index db86925ed8e..af8a2cde1a2 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -12284,6 +12284,8 @@ CREATE TABLE application_settings (
     encrypted_arkose_labs_data_exchange_key_iv bytea,
     toggle_security_policy_custom_ci boolean DEFAULT false NOT NULL,
     lock_toggle_security_policy_custom_ci boolean DEFAULT false NOT NULL,
+    toggle_security_policies_policy_scope boolean DEFAULT false NOT NULL,
+    lock_toggle_security_policies_policy_scope boolean DEFAULT false NOT NULL,
     CONSTRAINT app_settings_container_reg_cleanup_tags_max_list_size_positive CHECK ((container_registry_cleanup_tags_service_max_list_size >= 0)),
     CONSTRAINT app_settings_container_registry_pre_import_tags_rate_positive CHECK ((container_registry_pre_import_tags_rate >= (0)::numeric)),
     CONSTRAINT app_settings_dep_proxy_ttl_policies_worker_capacity_positive CHECK ((dependency_proxy_ttl_group_policy_worker_capacity >= 0)),
@@ -18640,6 +18642,7 @@ CREATE TABLE member_roles (
     admin_group_member boolean DEFAULT false NOT NULL,
     manage_project_access_tokens boolean DEFAULT false NOT NULL,
     archive_project boolean DEFAULT false NOT NULL,
+    remove_project boolean DEFAULT false NOT NULL,
     CONSTRAINT check_4364846f58 CHECK ((char_length(description) <= 255)),
     CONSTRAINT check_9907916995 CHECK ((char_length(name) <= 255))
 );
@@ -19592,6 +19595,8 @@ CREATE TABLE namespace_settings (
     enforce_ssh_certificates boolean DEFAULT false NOT NULL,
     toggle_security_policy_custom_ci boolean,
     lock_toggle_security_policy_custom_ci boolean DEFAULT false NOT NULL,
+    toggle_security_policies_policy_scope boolean,
+    lock_toggle_security_policies_policy_scope boolean DEFAULT false NOT NULL,
     CONSTRAINT check_0ba93c78c7 CHECK ((char_length(default_branch_name) <= 255)),
     CONSTRAINT namespace_settings_unique_project_download_limit_alertlist_size CHECK ((cardinality(unique_project_download_limit_alertlist) <= 100)),
     CONSTRAINT namespace_settings_unique_project_download_limit_allowlist_size CHECK ((cardinality(unique_project_download_limit_allowlist) <= 100))