Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-03-09 00:17:17 +00:00
parent 43a9a781a4 ff44b2e92d
commit 447d7e6127
206 changed files with 2401 additions and 737 deletions
--- 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