diff options
| author | George Claghorn <george.claghorn@gmail.com> | 2018-04-23 16:01:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-23 16:01:16 -0500 |
| commit | ef5902a2f195c2be5a4e9ad0f31003774a93aa1c (patch) | |
| tree | d9366b40aa381688eb828d54628d5712bc5a1a60 /activestorage/lib | |
| parent | e970d15211a8efd7349ff0e90d44d887b85793c2 (diff) | |
| parent | f2e2cef15bdb31353aee2254ca2ab378979cc24a (diff) | |
| download | rails-ef5902a2f195c2be5a4e9ad0f31003774a93aa1c.tar.gz rails-ef5902a2f195c2be5a4e9ad0f31003774a93aa1c.tar.bz2 rails-ef5902a2f195c2be5a4e9ad0f31003774a93aa1c.zip | |
Merge pull request #32471 from janko-m/use-image_processing-gem
Use ImageProcessing gem for ActiveStorage variants
Diffstat (limited to 'activestorage/lib')
| -rw-r--r-- | activestorage/lib/active_storage.rb | 1 | ||||
| -rw-r--r-- | activestorage/lib/active_storage/engine.rb | 11 |
2 files changed, 7 insertions, 5 deletions
diff --git a/activestorage/lib/active_storage.rb b/activestorage/lib/active_storage.rb index e1bd974853..e1deee1d82 100644 --- a/activestorage/lib/active_storage.rb +++ b/activestorage/lib/active_storage.rb @@ -45,6 +45,7 @@ module ActiveStorage mattr_accessor :queue mattr_accessor :previewers, default: [] mattr_accessor :analyzers, default: [] + mattr_accessor :variant_processor, default: :mini_magick mattr_accessor :paths, default: {} mattr_accessor :variable_content_types, default: [] mattr_accessor :content_types_to_serve_as_binary, default: [] diff --git a/activestorage/lib/active_storage/engine.rb b/activestorage/lib/active_storage/engine.rb index 1385e2aa84..99588cdd4b 100644 --- a/activestorage/lib/active_storage/engine.rb +++ b/activestorage/lib/active_storage/engine.rb @@ -43,11 +43,12 @@ module 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.logger = app.config.active_storage.logger || Rails.logger + ActiveStorage.queue = app.config.active_storage.queue + ActiveStorage.variant_processor = app.config.active_storage.variant_processor || :mini_magick + ActiveStorage.previewers = app.config.active_storage.previewers || [] + ActiveStorage.analyzers = app.config.active_storage.analyzers || [] + ActiveStorage.paths = app.config.active_storage.paths || {} 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 || [] |