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

2020-08-02 14:30:28 +02:00
parent b12117c4a3 3ade834830
commit 23cd5f2c15
8 changed files with 62 additions and 7 deletions
--- a/lib/paperclip/response_with_limit_adapter.rb
+++ b/lib/paperclip/response_with_limit_adapter.rb
@@ -19,7 +19,7 @@ module Paperclip
      @original_filename = filename_from_content_disposition || filename_from_path || 'data'
      @size = @target.response.content_length
      @tempfile = copy_to_tempfile(@target)
-      @content_type = @target.response.mime_type || ContentTypeDetector.new(@tempfile.path).detect
+      @content_type = ContentTypeDetector.new(@tempfile.path).detect
    end

    def copy_to_tempfile(source)