about summary refs log tree commit diff
path: root/app/services/backup_service.rb
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2018-08-21 12:25:50 +0200
committerGitHub <noreply@github.com>2018-08-21 12:25:50 +0200
commitd98de8ada743886c3cd48b2ad942d46b805af7a9 (patch)
tree9c7551f7b60a7884929e259e85d91f14c6602395 /app/services/backup_service.rb
parent83746b63646088396232a348f4024b101f39c78a (diff)
Get rid of all batch order warnings (#8334)
Diffstat (limited to 'app/services/backup_service.rb')
-rw-r--r--app/services/backup_service.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/backup_service.rb b/app/services/backup_service.rb
index 8492c1117..da7db6462 100644
--- a/app/services/backup_service.rb
+++ b/app/services/backup_service.rb
@@ -18,7 +18,7 @@ class BackupService < BaseService
   def build_json!
     @collection = serialize(collection_presenter, ActivityPub::CollectionSerializer)
 
-    account.statuses.with_includes.find_in_batches do |statuses|
+    account.statuses.with_includes.reorder(nil).find_in_batches do |statuses|
       statuses.each do |status|
         item = serialize(status, ActivityPub::ActivitySerializer)
         item.delete(:'@context')
@@ -60,7 +60,7 @@ class BackupService < BaseService
   end
 
   def dump_media_attachments!(tar)
-    MediaAttachment.attached.where(account: account).find_in_batches do |media_attachments|
+    MediaAttachment.attached.where(account: account).reorder(nil).find_in_batches do |media_attachments|
       media_attachments.each do |m|
         download_to_tar(tar, m.file, m.file.path)
       end