diff options
| author | ThibG <thib@sitedethib.com> | 2020-08-02 16:05:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-02 16:05:01 +0200 |
| commit | 141ac8db8b98230188b13f1da801611bcdc6a9f1 (patch) | |
| tree | fbfbc1daae45e7b4cdf8c0525b646a39ba29af96 /lib | |
| parent | b12117c4a375b906673a5b67506475a8e78ad6ef (diff) | |
| parent | de7ba22c458c3eb9d0edf0c4c25250870c8a60d5 (diff) | |
Merge pull request #1392 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/paperclip/response_with_limit_adapter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/paperclip/response_with_limit_adapter.rb b/lib/paperclip/response_with_limit_adapter.rb index 7d897b8d6..8711b1349 100644 --- 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) |