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

2020-01-13 13:14:35 +01:00
parent 7ab12b7654 3287ec8ca3
commit 83f8bf48d9
75 changed files with 311 additions and 245 deletions
--- a/app/models/concerns/attachmentable.rb
+++ b/app/models/concerns/attachmentable.rb
@ -74,7 +74,7 @@ module Attachmentable
    self.class.attachment_definitions.each_key do |attachment_name|
      attachment = send(attachment_name)

-      next if attachment.blank?
+      next if attachment.blank? || attachment.queued_for_write[:original].blank?

      attachment.instance_write :file_name, SecureRandom.hex(8) + File.extname(attachment.instance_read(:file_name))
    end