Add latest changes from gitlab-org/gitlab@master

7 files changed, 44 insertions, 2 deletions

diff --git a/db/migrate/20231129124754_add_cascading_toggle_security_policy_custom_ci_setting.rb b/db/migrate/20231129124754_add_cascading_toggle_security_policy_custom_ci_setting.rb
new file mode 100644
index 00000000000..0a97d500e3d
--- /dev/null
+++ b/db/migrate/20231129124754_add_cascading_toggle_security_policy_custom_ci_setting.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class AddCascadingToggleSecurityPolicyCustomCiSetting < Gitlab::Database::Migration[2.2]
+  milestone '16.8'
+
+  include Gitlab::Database::MigrationHelpers::CascadingNamespaceSettings
+
+  enable_lock_retries!
+
+  def up
+    add_cascading_namespace_setting :toggle_security_policy_custom_ci, :boolean, default: false, null: false
+  end
+
+  def down
+    remove_cascading_namespace_setting :toggle_security_policy_custom_ci
+  end
+end
diff --git a/db/post_migrate/20231218062442_remove_max_workspaces_from_remote_development_agent_configs.rb b/db/post_migrate/20231218062442_remove_max_workspaces_from_remote_development_agent_configs.rb
new file mode 100644
index 00000000000..523aae9f214
--- /dev/null
+++ b/db/post_migrate/20231218062442_remove_max_workspaces_from_remote_development_agent_configs.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class RemoveMaxWorkspacesFromRemoteDevelopmentAgentConfigs < Gitlab::Database::Migration[2.2]
+  milestone '16.8'
+  enable_lock_retries!
+
+  def change
+    remove_column :remote_development_agent_configs, :max_workspaces, :bigint, default: -1, null: false
+  end
+end
diff --git a/db/post_migrate/20231218062505_remove_max_workspaces_per_user_from_remote_development_agent_configs.rb b/db/post_migrate/20231218062505_remove_max_workspaces_per_user_from_remote_development_agent_configs.rb
new file mode 100644
index 00000000000..10a5e314ef9
--- /dev/null
+++ b/db/post_migrate/20231218062505_remove_max_workspaces_per_user_from_remote_development_agent_configs.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class RemoveMaxWorkspacesPerUserFromRemoteDevelopmentAgentConfigs < Gitlab::Database::Migration[2.2]
+  milestone '16.8'
+  enable_lock_retries!
+
+  def change
+    remove_column :remote_development_agent_configs, :max_workspaces_per_user, :bigint, default: -1, null: false
+  end
+end
diff --git a/db/schema_migrations/20231129124754 b/db/schema_migrations/20231129124754
new file mode 100644
index 00000000000..7a95a77c47b
--- /dev/null
+++ b/db/schema_migrations/20231129124754
@@ -0,0 +1 @@
+29c39f7290a075ead472b5b5d41e60160073d5d49f05ae2b281e48a123990dfc
\ No newline at end of file
diff --git a/db/schema_migrations/20231218062442 b/db/schema_migrations/20231218062442
new file mode 100644
index 00000000000..0db2337f7b2
--- /dev/null
+++ b/db/schema_migrations/20231218062442
@@ -0,0 +1 @@
+90b8a5342c57f8383b20684774ee5f7a551be4e93dcdf6d17bb2c2490fcd5214
\ No newline at end of file
diff --git a/db/schema_migrations/20231218062505 b/db/schema_migrations/20231218062505
new file mode 100644
index 00000000000..c047198bcb3
--- /dev/null
+++ b/db/schema_migrations/20231218062505
@@ -0,0 +1 @@
+814dc93e655e9f4abb2af348b67069f2b747300614e8251346bf252477cf3dbe
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 70fd8f4e3b4..b429b3ab4f1 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -12282,6 +12282,8 @@ CREATE TABLE application_settings (
     security_txt_content text,
     encrypted_arkose_labs_data_exchange_key bytea,
     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,
     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)),
@@ -19608,6 +19610,8 @@ CREATE TABLE namespace_settings (
     product_analytics_enabled boolean DEFAULT false NOT NULL,
     allow_merge_without_pipeline boolean DEFAULT false NOT NULL,
     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,
     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))
@@ -22774,8 +22778,6 @@ CREATE TABLE remote_development_agent_configs (
     network_policy_egress jsonb DEFAULT '[{"allow": "0.0.0.0/0", "except": ["10.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16"]}]'::jsonb NOT NULL,
     default_resources_per_workspace_container jsonb DEFAULT '{}'::jsonb NOT NULL,
     max_resources_per_workspace jsonb DEFAULT '{}'::jsonb NOT NULL,
-    max_workspaces bigint DEFAULT '-1'::integer NOT NULL,
-    max_workspaces_per_user bigint DEFAULT '-1'::integer NOT NULL,
     workspaces_quota bigint DEFAULT '-1'::integer NOT NULL,
     workspaces_per_user_quota bigint DEFAULT '-1'::integer NOT NULL,
     CONSTRAINT check_72947a4495 CHECK ((char_length(gitlab_workspaces_proxy_namespace) <= 63)),