about summary refs log tree commit diff
diff options
context:
space:
mode:
authorStarfall <admin@plural.cafe>2020-05-22 15:14:15 -0500
committerStarfall <admin@plural.cafe>2020-05-22 15:14:15 -0500
commit0167552bed46508efeed266853a1ee4437e12998 (patch)
tree494dad01b25ddd6a6f1f1cbd51f368ea499325d9
parent4d8b8d44466dd6312d4914c5a14667ac7eaffbb8 (diff)
parentb07c1e615b3f536b81eca5884ce7ee022c113238 (diff)
Merge branch 'glitch'
-rw-r--r--Gemfile.lock10
-rw-r--r--app/services/backup_service.rb2
2 files changed, 6 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index e4af7b195..f3bf40ff0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -201,13 +201,13 @@ GEM
       dotenv (= 2.7.5)
       railties (>= 3.2, < 6.1)
     e2mmap (0.1.0)
-    elasticsearch (7.6.0)
-      elasticsearch-api (= 7.6.0)
-      elasticsearch-transport (= 7.6.0)
-    elasticsearch-api (7.6.0)
+    elasticsearch (7.7.0)
+      elasticsearch-api (= 7.7.0)
+      elasticsearch-transport (= 7.7.0)
+    elasticsearch-api (7.7.0)
       multi_json
     elasticsearch-dsl (0.1.9)
-    elasticsearch-transport (7.6.0)
+    elasticsearch-transport (7.7.0)
       faraday (~> 1)
       multi_json
     encryptor (3.0.0)
diff --git a/app/services/backup_service.rb b/app/services/backup_service.rb
index 691d024e1..989fd6784 100644
--- a/app/services/backup_service.rb
+++ b/app/services/backup_service.rb
@@ -22,7 +22,7 @@ class BackupService < BaseService
 
     account.statuses.with_includes.reorder(nil).find_in_batches do |statuses|
       statuses.each do |status|
-        item = serialize_payload(status, ActivityPub::ActivitySerializer, signer: @account)
+        item = serialize_payload(status, ActivityPub::ActivitySerializer, signer: @account, allow_local_only: true)
         item.delete(:'@context')
 
         unless item[:type] == 'Announce' || item[:object][:attachment].blank?