Merge commit '389a6cc4c0' into upstream-20231108

app/services/approve_appeal_service.rb

@@ -62,7 +62,7 @@ class ApproveAppealService < BaseService
 
   def undo_force_cw!
     representative_account = Account.representative
-    @strike.statuses.includes(:media_attachments).each do |status|
+    @strike.statuses.includes(:media_attachments).find_each do |status|
       UpdateStatusService.new.call(status, representative_account.id, spoiler_text: '')
     end
   end

app/services/remove_status_service.rb

@@ -128,7 +128,7 @@ class RemoveStatusService < BaseService
   end
 
   def decrement_references
-    @status.references.each do |ref|
+    @status.references.find_each do |ref|
       ref.decrement_count!(:status_referred_by_count)
     end
   end

app/services/un_emoji_react_service.rb

@@ -28,7 +28,7 @@ class UnEmojiReactService < BaseService
   private
 
   def bulk(account, status)
-    EmojiReaction.where(account: account, status: status).each do |emoji_reaction|
+    EmojiReaction.where(account: account, status: status).find_each do |emoji_reaction|
       call(account, status, emoji_reaction)
     end
   end