diff options
| author | ThibG <thib@sitedethib.com> | 2020-09-01 17:36:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-01 17:36:30 +0200 |
| commit | d967251fdc3826ad27d30e55258cfa4cdfd7c871 (patch) | |
| tree | 91926ccaedf470bfef058cc7156f9f362d46186a /lib/paperclip | |
| parent | d95dd3883e0c7d1626f5e3b88d24af2627a641e2 (diff) | |
| parent | 787a629b8f1df4cce53a9de7f3aa668cc9ef632f (diff) | |
Merge pull request #1417 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'lib/paperclip')
| -rw-r--r-- | lib/paperclip/color_extractor.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/paperclip/color_extractor.rb b/lib/paperclip/color_extractor.rb index c8bb771a0..f850dc067 100644 --- a/lib/paperclip/color_extractor.rb +++ b/lib/paperclip/color_extractor.rb @@ -89,7 +89,7 @@ module Paperclip end end - # rubocop:disable Style/MethodParameterName + # rubocop:disable Naming/MethodParameterName def rgb_to_hsl(r, g, b) r /= 255.0 g /= 255.0 @@ -156,7 +156,7 @@ module Paperclip [(r * 255).round, (g * 255).round, (b * 255).round] end - # rubocop:enable Style/MethodParameterName + # rubocop:enable Naming/MethodParameterName def lighten_or_darken(color, by) hue, saturation, light = rgb_to_hsl(color.r, color.g, color.b) |