From 379542d59ca6b728defaef8487eb3ed77246bd91 Mon Sep 17 00:00:00 2001 From: Claire Date: Wed, 2 Sep 2026 14:35:59 +0000 Subject: [PATCH] Remove `ignored_columns` for 4.3 and earlier (#40359) --- app/models/account.rb | 2 -- app/models/account_relationship_severance_event.rb | 4 ---- app/models/custom_filter.rb | 2 -- app/models/notification_policy.rb | 7 ------- app/models/notification_request.rb | 2 -- app/models/user.rb | 2 -- 6 files changed, 19 deletions(-) diff --git a/app/models/account.rb b/app/models/account.rb index 0e5a2ddfe80..31a5deadc82 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -64,8 +64,6 @@ # class Account < ApplicationRecord - self.ignored_columns += %w(devices_url) - BACKGROUND_REFRESH_INTERVAL = 1.week.freeze REFRESH_DEADLINE = 6.hours STALE_THRESHOLD = 1.day diff --git a/app/models/account_relationship_severance_event.rb b/app/models/account_relationship_severance_event.rb index 89e6d8b9817..247dba4d9b8 100644 --- a/app/models/account_relationship_severance_event.rb +++ b/app/models/account_relationship_severance_event.rb @@ -14,10 +14,6 @@ # relationship_severance_event_id :bigint(8) not null # class AccountRelationshipSeveranceEvent < ApplicationRecord - self.ignored_columns += %w( - relationships_count - ) - belongs_to :account belongs_to :relationship_severance_event diff --git a/app/models/custom_filter.rb b/app/models/custom_filter.rb index e1f8e28a4f2..2396196a2e8 100644 --- a/app/models/custom_filter.rb +++ b/app/models/custom_filter.rb @@ -15,8 +15,6 @@ # class CustomFilter < ApplicationRecord - self.ignored_columns += %w(whole_word irreversible) - alias_attribute :title, :phrase alias_attribute :filter_action, :action diff --git a/app/models/notification_policy.rb b/app/models/notification_policy.rb index cf850999f91..cca40ba0477 100644 --- a/app/models/notification_policy.rb +++ b/app/models/notification_policy.rb @@ -17,13 +17,6 @@ # class NotificationPolicy < ApplicationRecord - self.ignored_columns += %w( - filter_not_following - filter_not_followers - filter_new_accounts - filter_private_mentions - ) - belongs_to :account has_many :notification_requests, primary_key: :account_id, foreign_key: :account_id, dependent: nil, inverse_of: false diff --git a/app/models/notification_request.rb b/app/models/notification_request.rb index e8ed508d87e..b44c65e3ca8 100644 --- a/app/models/notification_request.rb +++ b/app/models/notification_request.rb @@ -14,8 +14,6 @@ # class NotificationRequest < ApplicationRecord - self.ignored_columns += %w(dismissed) - include Paginable MAX_MEANINGFUL_COUNT = 100 diff --git a/app/models/user.rb b/app/models/user.rb index 33decbab32d..4d3e68a2214 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -43,11 +43,9 @@ class User < ApplicationRecord self.ignored_columns += %w( - admin encrypted_otp_secret encrypted_otp_secret_iv encrypted_otp_secret_salt - moderator skip_sign_in_token )