diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-08-02 14:30:28 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-08-02 14:30:28 +0200 |
| commit | 23cd5f2c154e228b6b7257e4f079550ec532da1e (patch) | |
| tree | 5b948f7386d40b4afc9cb90f8d8ad17da6117299 /lib | |
| parent | b12117c4a375b906673a5b67506475a8e78ad6ef (diff) | |
| parent | 3ade83483054cdc2f8e7887ad236ede4341c0c09 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
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) |