diff options
| author | ThibG <thib@sitedethib.com> | 2020-07-01 00:18:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-01 00:18:49 +0200 |
| commit | 814d3f343f8caae3366410900eec0b90b9bbbb7b (patch) | |
| tree | 5d0b779a144afd2bff33503804cd5dcc58012ff6 /lib/paperclip/attachment_extensions.rb | |
| parent | 10ede3eb27c5de5d4e3a283e333af2a54da6177d (diff) | |
| parent | 3d7ce178dd7be9ef02d34bf6734365d0aefa3120 (diff) | |
Merge pull request #1366 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'lib/paperclip/attachment_extensions.rb')
| -rw-r--r-- | lib/paperclip/attachment_extensions.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/paperclip/attachment_extensions.rb b/lib/paperclip/attachment_extensions.rb index f3e51dbd3..93df0a326 100644 --- a/lib/paperclip/attachment_extensions.rb +++ b/lib/paperclip/attachment_extensions.rb @@ -7,7 +7,7 @@ module Paperclip # usage, and we still want to generate thumbnails straight # away, it's the only style we need to exclude def process_style?(style_name, style_args) - if style_name == :original && instance.respond_to?(:delay_processing?) && instance.delay_processing? + if style_name == :original && instance.respond_to?(:delay_processing_for_attachment?) && instance.delay_processing_for_attachment?(name) false else style_args.empty? || style_args.include?(style_name) |