From: Claire <claire.github-309c@sitedethib.com>
Date: Sat, 24 Jul 2021 12:41:46 +0000 (+0200)
Subject: Fix scoped order warning in RemoveStatusService (#16531)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=1d67acb72fa418a456c5e4762425702bfe7702b1;p=mastodon.git

Fix scoped order warning in RemoveStatusService (#16531)

Fixes “Scoped order is ignored, it's forced to be batch order.”
---

diff --git a/app/services/remove_status_service.rb b/app/services/remove_status_service.rb
index b680c8e96..f9c3dcf78 100644
--- a/app/services/remove_status_service.rb
+++ b/app/services/remove_status_service.rb
@@ -102,7 +102,7 @@ class RemoveStatusService < BaseService
     # because once original status is gone, reblogs will disappear
     # without us being able to do all the fancy stuff
 
-    @status.reblogs.includes(:account).find_each do |reblog|
+    @status.reblogs.includes(:account).reorder(nil).find_each do |reblog|
       RemoveStatusService.new.call(reblog, original_removed: true)
     end
   end