diff --git a/app/models/namespace_setting.rb b/app/models/namespace_setting.rb index 0b343338911a47021526abcc0d2033aed1b0c556..b085270b1cab6566ddb3d3f29f8acbd53d9ae1d1 100644 --- a/app/models/namespace_setting.rb +++ b/app/models/namespace_setting.rb @@ -10,6 +10,7 @@ class NamespaceSetting < ApplicationRecord columns_changing_default :require_dpop_for_manage_api_endpoints ignore_column :token_expiry_notify_inherited, remove_with: '17.9', remove_after: '2025-01-11' + ignore_column :enable_auto_assign_gitlab_duo_pro_seats, remove_with: '18.5', remove_after: '2025-08-16' enum :pipeline_variables_default_role, ProjectCiCdSetting::PIPELINE_VARIABLES_OVERRIDE_ROLES, prefix: true ignore_column :third_party_ai_features_enabled, remove_with: '16.11', remove_after: '2024-04-18' diff --git a/db/post_migrate/20250704084854_remove_auto_assign_duo_pro_namespace_settings.rb b/db/post_migrate/20250704084854_remove_auto_assign_duo_pro_namespace_settings.rb new file mode 100644 index 0000000000000000000000000000000000000000..8457bb5c48958d73f9f7c8f05c13369e933874ac --- /dev/null +++ b/db/post_migrate/20250704084854_remove_auto_assign_duo_pro_namespace_settings.rb @@ -0,0 +1,14 @@ +# frozen_string_literal: true + +class RemoveAutoAssignDuoProNamespaceSettings < Gitlab::Database::Migration[2.3] + milestone '18.2' + + def change + remove_column :namespace_settings, + :enable_auto_assign_gitlab_duo_pro_seats, + :boolean, + default: false, + null: false, + if_exists: true + end +end diff --git a/db/schema_migrations/20250704084854 b/db/schema_migrations/20250704084854 new file mode 100644 index 0000000000000000000000000000000000000000..5aec12b7e45838102d12637e7e750360f5e62cf1 --- /dev/null +++ b/db/schema_migrations/20250704084854 @@ -0,0 +1 @@ +c7ae95fb19f00f9500332b311816c0b366471646745a63ef0998d9b7d3440d06 \ No newline at end of file diff --git a/db/structure.sql b/db/structure.sql index 25bb90ea57e8b8bfb7d176327f5af2c251cf1156..4c4c3b45f736b9af4b8e634dc16038202ee72a4c 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -18464,7 +18464,6 @@ CREATE TABLE namespace_settings ( duo_features_enabled boolean, lock_duo_features_enabled boolean DEFAULT false NOT NULL, disable_personal_access_tokens boolean DEFAULT false NOT NULL, - enable_auto_assign_gitlab_duo_pro_seats boolean DEFAULT false NOT NULL, early_access_program_participant boolean DEFAULT false NOT NULL, remove_dormant_members boolean DEFAULT false NOT NULL, remove_dormant_members_period integer DEFAULT 90 NOT NULL,