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

Fix missing AccountWarning from merging.rb (#39982)

Browse Source
This commit is contained in:
Shlee 2026-07-29 18:02:34 +09:30 committed by Tarrien
parent 8b2202780a
commit b7f697323b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/concerns/account/merging.rb
View File

@ -16,10 +16,10 @@ module Account::Merging
Notification, NotificationPermission, NotificationRequest Notification, NotificationPermission, NotificationRequest
], ],
target_account_id: [ target_account_id: [
Follow, FollowRequest, Block, Mute, AccountModerationNote, AccountPin, AccountNote Follow, FollowRequest, Block, Mute, AccountModerationNote, AccountPin, AccountNote,
AccountWarning
], ],
reference_account_id: [CanonicalEmailBlock], reference_account_id: [CanonicalEmailBlock],
account_warning_id: [Appeal],
local_account_id: [SeveredRelationship], local_account_id: [SeveredRelationship],
remote_account_id: [SeveredRelationship], remote_account_id: [SeveredRelationship],
quoted_account_id: [Quote], quoted_account_id: [Quote],