From b1f4e5852c314ca8fd7d0d64864645a690b533bd Mon Sep 17 00:00:00 2001 From: Shlee Date: Wed, 29 Jul 2026 18:02:34 +0930 Subject: [PATCH] Fix missing AccountWarning from merging.rb (#39982) --- app/models/concerns/account/merging.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/concerns/account/merging.rb b/app/models/concerns/account/merging.rb index 681c4da879b..470240c6a11 100644 --- a/app/models/concerns/account/merging.rb +++ b/app/models/concerns/account/merging.rb @@ -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],