Merge branch 'main' into glitch-soc/merge-upstream

2021-07-25 12:48:48 +02:00
parent a2df067f98 a8a7066e97
commit b5e10d07ff
18 changed files with 195 additions and 108 deletions
--- a/app/services/remove_status_service.rb
+++ b/app/services/remove_status_service.rb
@@ -104,7 +104,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