lib/active_storage/engine.rb in activestorage-5.2.6.3 vs lib/active_storage/engine.rb in activestorage-5.2.7
- old
+ new
@@ -49,35 +49,33 @@
image/vnd.adobe.photoshop
image/vnd.microsoft.icon
application/pdf
)
- default_unsupported_image_processing_arguments = %w(
- -debug
- -display
- -distribute-cache
- -help
- -path
- -print
- -set
- -verbose
- -version
- -write
- -write-mask
- )
-
config.eager_load_namespaces << ActiveStorage
initializer "active_storage.configs" do
config.after_initialize do |app|
ActiveStorage.logger = app.config.active_storage.logger || Rails.logger
ActiveStorage.queue = app.config.active_storage.queue
ActiveStorage.previewers = app.config.active_storage.previewers || []
ActiveStorage.analyzers = app.config.active_storage.analyzers || []
ActiveStorage.paths = app.config.active_storage.paths || {}
- ActiveStorage.supported_image_processing_methods = app.config.active_storage.supported_image_processing_methods || []
- ActiveStorage.unsupported_image_processing_arguments = app.config.active_storage.unsupported_image_processing_arguments || default_unsupported_image_processing_arguments
+ ActiveStorage.supported_image_processing_methods += app.config.active_storage.supported_image_processing_methods || []
+ ActiveStorage.unsupported_image_processing_arguments = app.config.active_storage.unsupported_image_processing_arguments || %w(
+ -debug
+ -display
+ -distribute-cache
+ -help
+ -path
+ -print
+ -set
+ -verbose
+ -version
+ -write
+ -write-mask
+ )
ActiveStorage.variable_content_types = app.config.active_storage.variable_content_types || []
ActiveStorage.content_types_to_serve_as_binary = app.config.active_storage.content_types_to_serve_as_binary || []
ActiveStorage.content_types_allowed_inline = app.config.active_storage.content_types_allowed_inline || []
ActiveStorage.binary_content_type = app.config.active_storage.binary_content_type || "application/octet-stream"
end