diff options
| author | George Claghorn <george.claghorn@gmail.com> | 2018-02-24 15:27:53 -0500 |
|---|---|---|
| committer | George Claghorn <george.claghorn@gmail.com> | 2018-02-24 15:27:57 -0500 |
| commit | 3915a470d2b8898fdbc384d0f9f31e2ad8a2c899 (patch) | |
| tree | fee562827a93af6ebec14543f6106c1fc1248e5b /activestorage/lib | |
| parent | d04b5179ffc26ab7bfd7210e1103f5ab4f1bd54f (diff) | |
| download | rails-3915a470d2b8898fdbc384d0f9f31e2ad8a2c899.tar.gz rails-3915a470d2b8898fdbc384d0f9f31e2ad8a2c899.tar.bz2 rails-3915a470d2b8898fdbc384d0f9f31e2ad8a2c899.zip | |
Support varying ICO files
Closes #32096.
Diffstat (limited to 'activestorage/lib')
| -rw-r--r-- | activestorage/lib/active_storage/engine.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/activestorage/lib/active_storage/engine.rb b/activestorage/lib/active_storage/engine.rb index 8ba32490b1..9430dde028 100644 --- a/activestorage/lib/active_storage/engine.rb +++ b/activestorage/lib/active_storage/engine.rb @@ -18,7 +18,15 @@ module ActiveStorage config.active_storage.analyzers = [ ActiveStorage::Analyzer::ImageAnalyzer, ActiveStorage::Analyzer::VideoAnalyzer ] config.active_storage.paths = ActiveSupport::OrderedOptions.new - config.active_storage.variable_content_types = %w( image/png image/gif image/jpg image/jpeg image/vnd.adobe.photoshop ) + config.active_storage.variable_content_types = %w( + image/png + image/gif + image/jpg + image/jpeg + image/vnd.adobe.photoshop + image/vnd.microsoft.icon + ) + config.active_storage.content_types_to_serve_as_binary = %w( text/html text/javascript |