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

2020-02-06 21:36:38 +01:00
parent ccaefd139d aeb6efbb03
commit 1a54b9b99e
156 changed files with 1830 additions and 544 deletions
--- a/app/models/concerns/remotable.rb
+++ b/app/models/concerns/remotable.rb
@@ -36,8 +36,8 @@ module Remotable

            basename = SecureRandom.hex(8)

-            send("#{attachment_name}=", StringIO.new(response.body_with_limit(limit)))
            send("#{attachment_name}_file_name=", basename + extname)
+            send("#{attachment_name}=", StringIO.new(response.body_with_limit(limit)))

            self[attribute_name] = url if has_attribute?(attribute_name)
          end