Leahnaya/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2026-08-15 16:40:58 -05:00
Code Issues Actions 3 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 Claire
parent 3cf119feec
commit b1f4e5852c
1 changed files with 2 additions and 2 deletions
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
],
target_account_id: [
Follow, FollowRequest, Block, Mute, AccountModerationNote, AccountPin, AccountNote
Follow, FollowRequest, Block, Mute, AccountModerationNote, AccountPin, AccountNote,
AccountWarning
],
reference_account_id: [CanonicalEmailBlock],
account_warning_id: [Appeal],
local_account_id: [SeveredRelationship],
remote_account_id: [SeveredRelationship],
quoted_account_id: [Quote],