tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove ignored_columns for columns removed in pre-4.2.0 migrations (#39237)

Browse Source
This commit is contained in:
Claire 2026-06-01 16:40:03 +02:00 committed by GitHub
parent 4d54d9867e
commit 89d9fc8889
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 1 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/models/account.rb
View File

@ -63,15 +63,7 @@
# #
class Account < ApplicationRecord class Account < ApplicationRecord
self.ignored_columns += %w( self.ignored_columns += %w(devices_url)
devices_url
hub_url
remote_url
salmon_url
secret
subscription_expires_at
trust_level
)
BACKGROUND_REFRESH_INTERVAL = 1.week.freeze BACKGROUND_REFRESH_INTERVAL = 1.week.freeze
REFRESH_DEADLINE = 6.hours REFRESH_DEADLINE = 6.hours

1
app/models/account_stat.rb
View File

@ -16,7 +16,6 @@
class AccountStat < ApplicationRecord class AccountStat < ApplicationRecord
self.locking_column = nil self.locking_column = nil
self.ignored_columns += %w(lock_version)
belongs_to :account, inverse_of: :account_stat belongs_to :account, inverse_of: :account_stat

4
app/models/admin/action_log.rb
View File

@ -17,10 +17,6 @@
# #
class Admin::ActionLog < ApplicationRecord class Admin::ActionLog < ApplicationRecord
self.ignored_columns += %w(
recorded_changes
)
belongs_to :account belongs_to :account
belongs_to :target, polymorphic: true, optional: true belongs_to :target, polymorphic: true, optional: true

5
app/models/email_domain_block.rb
View File

@ -13,11 +13,6 @@
# #
class EmailDomainBlock < ApplicationRecord class EmailDomainBlock < ApplicationRecord
self.ignored_columns += %w(
ips
last_refresh_at
)
include DomainNormalizable include DomainNormalizable
include Paginable include Paginable

2
app/models/report.rb
View File

@ -22,8 +22,6 @@
# #
class Report < ApplicationRecord class Report < ApplicationRecord
self.ignored_columns += %w(action_taken)
include Paginable include Paginable
include RateLimitable include RateLimitable

4
app/models/status_edit.rb
View File

@ -21,10 +21,6 @@
class StatusEdit < ApplicationRecord class StatusEdit < ApplicationRecord
include RateLimitable include RateLimitable
self.ignored_columns += %w(
media_attachments_changed
)
class PreservedMediaAttachment < ActiveModelSerializers::Model class PreservedMediaAttachment < ActiveModelSerializers::Model
attributes :media_attachment, :description attributes :media_attachment, :description

5
app/models/user.rb
View File

@ -44,15 +44,10 @@
class User < ApplicationRecord class User < ApplicationRecord
self.ignored_columns += %w( self.ignored_columns += %w(
admin admin
current_sign_in_ip
encrypted_otp_secret encrypted_otp_secret
encrypted_otp_secret_iv encrypted_otp_secret_iv
encrypted_otp_secret_salt encrypted_otp_secret_salt
filtered_languages
last_sign_in_ip
moderator moderator
remember_created_at
remember_token
skip_sign_in_token skip_sign_in_token
) )