about summary refs log tree commit diff
path: root/lib/paperclip
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2018-03-06 06:29:01 +0100
committerGitHub <noreply@github.com>2018-03-06 06:29:01 +0100
commit78d772af862c536b2e985977b6ba549efe668fe0 (patch)
treea3dee3feb504500327d989c3fbd3f97f3d0ffcab /lib/paperclip
parente9e475a29d7b5039c8ce14de4cef7e4f54fb7b0e (diff)
Fix #3807: Increase avatars to 400x400 max (#6651)
But do not upscale when they are smaller
Diffstat (limited to 'lib/paperclip')
-rw-r--r--lib/paperclip/lazy_thumbnail.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/paperclip/lazy_thumbnail.rb b/lib/paperclip/lazy_thumbnail.rb
index 42f9a557a..aafa21343 100644
--- a/lib/paperclip/lazy_thumbnail.rb
+++ b/lib/paperclip/lazy_thumbnail.rb
@@ -4,6 +4,10 @@ module Paperclip
   class LazyThumbnail < Paperclip::Thumbnail
     def make
       return File.open(@file.path) unless needs_convert?
+
+      min_side = [@current_geometry.width, @current_geometry.height].min
+      options[:geometry] = "#{min_side.to_i}x#{min_side.to_i}#" if @target_geometry.square? && min_side < @target_geometry.width
+
       Paperclip::Thumbnail.make(file, options, attachment)
     end