Merge commit '44d92fa4f6aac5c45ad358287af48cd879f5665e' into glitch-soc/merge-upstream

lib/mastodon/cli/email_domain_blocks.rb

@@ -45,12 +45,7 @@ module Mastodon::CLI
         end
 
         other_domains = []
-        if options[:with_dns_records]
-          Resolv::DNS.open do |dns|
-            dns.timeouts = 5
-            other_domains = dns.getresources(@email_domain_block.domain, Resolv::DNS::Resource::IN::MX).to_a
-          end
-        end
+        other_domains = DomainResource.new(domain).mx if options[:with_dns_records]
 
         email_domain_block = EmailDomainBlock.new(domain: domain, other_domains: other_domains)
         email_domain_block.save!

lib/paperclip/vips_lazy_thumbnail.rb

@@ -52,6 +52,7 @@ module Paperclip
         # implement. If cropping ever becomes necessary for other situations, this will
         # need to be expanded.
         crop_width = crop_height = [target_width, target_height].min if @target_geometry&.square?
+        crop_width = crop_height = "'min(iw,ih)'" if crop_width == 'ih'
 
         filter = begin
           if @crop