diff --git a/app/models/namespace/detail.rb b/app/models/namespace/detail.rb index 4e1ce5d90230c8d56ac8db565c10e32ffa54774a..dbaee0becacb332c1face61ef8aef0f14eb0badf 100644 --- a/app/models/namespace/detail.rb +++ b/app/models/namespace/detail.rb @@ -7,7 +7,7 @@ class Namespace::Detail < ApplicationRecord validates :namespace, presence: true validates :description, length: { maximum: 255 } - ignore_column :pending_delete, remove_with: '17.7', remove_after: '2024-11-22' + ignore_column :pending_delete, remove_with: '17.8', remove_after: '2024-12-13' self.primary_key = :namespace_id diff --git a/db/post_migrate/20241121090148_remove_namespace_pending_delete_column.rb b/db/post_migrate/20241121090148_remove_namespace_pending_delete_column.rb new file mode 100644 index 0000000000000000000000000000000000000000..21b4418e790f5f193c060299ce5b00adb4103973 --- /dev/null +++ b/db/post_migrate/20241121090148_remove_namespace_pending_delete_column.rb @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +class RemoveNamespacePendingDeleteColumn < Gitlab::Database::Migration[2.2] + milestone '17.7' + + def up + remove_column :namespace_details, :pending_delete + end + + def down + add_column :namespace_details, :pending_delete, :boolean, default: false, null: false + end +end diff --git a/db/schema_migrations/20241121090148 b/db/schema_migrations/20241121090148 new file mode 100644 index 0000000000000000000000000000000000000000..02a629e252fc9b110ea0d8675fdfbab92af2e9a8 --- /dev/null +++ b/db/schema_migrations/20241121090148 @@ -0,0 +1 @@ +a44e559fb025b209754641f697bed11e39657fb61076e0288ff9e011628590b5 \ No newline at end of file diff --git a/db/structure.sql b/db/structure.sql index 8dc741b7b3473910836dca366d2ceecdceb09300..36c634575ff1d7b13d905053376b36e496d07fec 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -15044,7 +15044,6 @@ CREATE TABLE namespace_details ( description text, description_html text, creator_id bigint, - pending_delete boolean DEFAULT false NOT NULL, deleted_at timestamp with time zone );