diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-01-11 11:55:42 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-01-11 11:55:42 +0100 |
| commit | 33d30632fb627ba1742eff3e0c5fc84ccd156cdb (patch) | |
| tree | b7c15bb354c9d2f0ef25c50ab387007703f599d6 /lib/paperclip | |
| parent | d42e7e01dcd464f80637682d4eee6e5a7f36f26e (diff) | |
| parent | 11d603101a7b3389c679b8c155a3cb06203ca31a (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/models/public_feed.rb`: Upstream refactored a bit, glitch-soc had specific code for local-only statuses. Updated glitch-soc's specific code accordingly.
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 |