diff --git a/app/models/notification.rb b/app/models/notification.rb index d5d1d367fc0..336a02b09b8 100644 --- a/app/models/notification.rb +++ b/app/models/notification.rb @@ -1,10 +1,6 @@ # frozen_string_literal: true class Notification < ActiveRecord::Base - self.ignored_columns = [ - :old_id, # TODO: Remove once 20240829140226_drop_old_notification_id_columns has been promoted to pre-deploy - ] - attr_accessor :acting_user attr_accessor :acting_username diff --git a/app/models/shelved_notification.rb b/app/models/shelved_notification.rb index 633872f3d65..0929563e34d 100644 --- a/app/models/shelved_notification.rb +++ b/app/models/shelved_notification.rb @@ -1,10 +1,6 @@ # frozen_string_literal: true class ShelvedNotification < ActiveRecord::Base - self.ignored_columns = [ - :old_notification_id, # TODO: Remove once 20240829140226_drop_old_notification_id_columns has been promoted to pre-deploy - ] - belongs_to :notification def process diff --git a/app/models/user.rb b/app/models/user.rb index a976586a1b9..2395102c867 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,13 +1,6 @@ # frozen_string_literal: true class User < ActiveRecord::Base - self.ignored_columns = [ - :salt, # TODO: Remove when DropPasswordColumnsFromUsers has been promoted to pre-deploy. - :password_hash, # TODO: Remove when DropPasswordColumnsFromUsers has been promoted to pre-deploy. - :password_algorithm, # TODO: Remove when DropPasswordColumnsFromUsers has been promoted to pre-deploy. - :old_seen_notification_id, # TODO: Remove once 20240829140226_drop_old_notification_id_columns has been promoted to pre-deploy - ] - include Searchable include Roleable include HasCustomFields diff --git a/app/models/user_badge.rb b/app/models/user_badge.rb index 8bec4281ca1..088929d6a4d 100644 --- a/app/models/user_badge.rb +++ b/app/models/user_badge.rb @@ -1,10 +1,6 @@ # frozen_string_literal: true class UserBadge < ActiveRecord::Base - self.ignored_columns = [ - :old_notification_id, # TODO: Remove once 20240829140226_drop_old_notification_id_columns has been promoted to pre-deploy - ] - belongs_to :badge belongs_to :user belongs_to :granted_by, class_name: "User" diff --git a/db/post_migrate/20240829140226_drop_old_notification_id_columns.rb b/db/migrate/20240829140226_drop_old_notification_id_columns.rb similarity index 100% rename from db/post_migrate/20240829140226_drop_old_notification_id_columns.rb rename to db/migrate/20240829140226_drop_old_notification_id_columns.rb diff --git a/db/post_migrate/20240909121255_rebake_user_onebox.rb b/db/migrate/20240909121255_rebake_user_onebox.rb similarity index 100% rename from db/post_migrate/20240909121255_rebake_user_onebox.rb rename to db/migrate/20240909121255_rebake_user_onebox.rb diff --git a/db/post_migrate/20240910090759_make_password_columns_from_users_read_only.rb b/db/migrate/20240910090759_make_password_columns_from_users_read_only.rb similarity index 100% rename from db/post_migrate/20240910090759_make_password_columns_from_users_read_only.rb rename to db/migrate/20240910090759_make_password_columns_from_users_read_only.rb diff --git a/db/post_migrate/20240912210450_delete_anonymous_users_from_directory_items.rb b/db/migrate/20240912210450_delete_anonymous_users_from_directory_items.rb similarity index 100% rename from db/post_migrate/20240912210450_delete_anonymous_users_from_directory_items.rb rename to db/migrate/20240912210450_delete_anonymous_users_from_directory_items.rb diff --git a/db/post_migrate/20241011080517_drop_password_columns_from_users.rb b/db/migrate/20241011080517_drop_password_columns_from_users.rb similarity index 100% rename from db/post_migrate/20241011080517_drop_password_columns_from_users.rb rename to db/migrate/20241011080517_drop_password_columns_from_users.rb diff --git a/db/post_migrate/20241023041126_clear_duplicate_admin_notices.rb b/db/migrate/20241023041126_clear_duplicate_admin_notices.rb similarity index 100% rename from db/post_migrate/20241023041126_clear_duplicate_admin_notices.rb rename to db/migrate/20241023041126_clear_duplicate_admin_notices.rb