Merge remote-tracking branch 'upstream/main'

This commit is contained in:
Essem 2024-06-30 15:41:10 -05:00
commit 8a01720cb2
No known key found for this signature in database
GPG key ID: 7D497397CC3A2A8C
200 changed files with 3431 additions and 2011 deletions

View file

@ -5,7 +5,11 @@ if Rails.configuration.x.use_vips
require 'vips'
abort('Incompatible libvips version, please install libvips >= 8.13') unless Vips.at_least_libvips?(8, 13)
unless Vips.at_least_libvips?(8, 13)
abort <<~ERROR.squish
Incompatible libvips version (#{Vips.version_string}), please install libvips >= 8.13
ERROR
end
Vips.block('VipsForeign', true)
@ -25,3 +29,11 @@ if Rails.configuration.x.use_vips
Vips.block_untrusted(true)
end
# In some places of the code, we rescue this exception, but we don't always
# load libvips, so it may be an undefined constant:
unless defined?(Vips)
module Vips
class Error < StandardError; end
end
end