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

2020-02-25 14:28:13 +01:00
parent 0d41fef506 7face973fa
commit 85933bc9ff
13 changed files with 76 additions and 61 deletions
--- a/app/services/backup_service.rb
+++ b/app/services/backup_service.rb
@ -66,6 +66,8 @@ class BackupService < BaseService
  def dump_media_attachments!(tar)
    MediaAttachment.attached.where(account: account).reorder(nil).find_in_batches do |media_attachments|
      media_attachments.each do |m|
+        next unless m.file&.path
+
        download_to_tar(tar, m.file, m.file.path)
      end