diff options
| author | Starfall <us@starfall.systems> | 2021-01-13 13:39:46 -0600 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2021-01-13 13:39:46 -0600 |
| commit | 65263e6309fb4dea1a93d4b4806af629d317c156 (patch) | |
| tree | 8a142dea5cc3d4081f551c02e953976d3c0930bf /lib/paperclip | |
| parent | 29227b32e150894e15098bcf216b1f5c08763200 (diff) | |
| parent | a7a47834e50645746355e2b9a88244c1804c73cd (diff) | |
Merge branch 'glitch' into main
Diffstat (limited to 'lib/paperclip')
| -rw-r--r-- | lib/paperclip/attachment_extensions.rb | 2 | ||||
| -rw-r--r-- | lib/paperclip/color_extractor.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/paperclip/attachment_extensions.rb b/lib/paperclip/attachment_extensions.rb index 94f7769b6..e25a34213 100644 --- a/lib/paperclip/attachment_extensions.rb +++ b/lib/paperclip/attachment_extensions.rb @@ -27,7 +27,7 @@ module Paperclip return true if original_filename == other_filename return false if original_filename.nil? - formats = styles.values.map(&:format).compact + formats = styles.values.filter_map(&:format) return false if formats.empty? diff --git a/lib/paperclip/color_extractor.rb b/lib/paperclip/color_extractor.rb index f850dc067..a70a3d21f 100644 --- a/lib/paperclip/color_extractor.rb +++ b/lib/paperclip/color_extractor.rb @@ -142,7 +142,7 @@ module Paperclip g = 0.0 b = 0.0 - if s == 0.0 + if s.zero? r = l.to_f g = l.to_f b = l.to_f # achromatic |