diff --git a/db/migrate/20240516124823_remove_namespace_settings_toggle_security_policies_policy_scope_column.rb b/db/migrate/20240516124823_remove_namespace_settings_toggle_security_policies_policy_scope_column.rb new file mode 100644 index 0000000000000000000000000000000000000000..31b496289b953c6503a2d7501ac76335ac073bde --- /dev/null +++ b/db/migrate/20240516124823_remove_namespace_settings_toggle_security_policies_policy_scope_column.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +class RemoveNamespaceSettingsToggleSecurityPoliciesPolicyScopeColumn < Gitlab::Database::Migration[2.2] + milestone '17.2' + + include Gitlab::Database::MigrationHelpers::CascadingNamespaceSettings + + def up + remove_cascading_namespace_setting :toggle_security_policies_policy_scope + end + + def down + add_cascading_namespace_setting :toggle_security_policies_policy_scope, :boolean, default: false, null: false + end +end diff --git a/db/schema_migrations/20240516124823 b/db/schema_migrations/20240516124823 new file mode 100644 index 0000000000000000000000000000000000000000..7a7e0cb81d40017a1ba346845936a065c66c0b47 --- /dev/null +++ b/db/schema_migrations/20240516124823 @@ -0,0 +1 @@ +0fc85e8baa43f9bf4f1b5d40c68b9838a32a298a0f388508ef0c172c3b2d738f \ No newline at end of file diff --git a/db/structure.sql b/db/structure.sql index 647d253f3fffdfa9ae80baf8736658f39b8e3b1d..a652fd2148747f6c7ddd006b8ddb12ab15a219bd 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -5338,8 +5338,6 @@ 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, rate_limits jsonb DEFAULT '{}'::jsonb NOT NULL, elasticsearch_max_code_indexing_concurrency integer DEFAULT 30 NOT NULL, enable_member_promotion_management boolean DEFAULT false NOT NULL, @@ -12905,8 +12903,6 @@ 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, math_rendering_limits_enabled boolean, lock_math_rendering_limits_enabled boolean DEFAULT false NOT NULL, duo_features_enabled boolean,