diff options
| -rw-r--r-- | activestorage/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | activestorage/lib/active_storage/engine.rb | 1 | ||||
| -rw-r--r-- | guides/source/configuring.md | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/activestorage/CHANGELOG.md b/activestorage/CHANGELOG.md index f4e2826dc6..ba57315301 100644 --- a/activestorage/CHANGELOG.md +++ b/activestorage/CHANGELOG.md @@ -1,3 +1,7 @@ +* Add progressive JPG to default list of variable content types + + *Maurice Kühlborn* + * Add `ActiveStorage.routes_prefix` for configuring generated routes. *Chris Bisnett* diff --git a/activestorage/lib/active_storage/engine.rb b/activestorage/lib/active_storage/engine.rb index 7eb93b5e16..d51e806220 100644 --- a/activestorage/lib/active_storage/engine.rb +++ b/activestorage/lib/active_storage/engine.rb @@ -26,6 +26,7 @@ module ActiveStorage image/gif image/jpg image/jpeg + image/pjpeg image/vnd.adobe.photoshop image/vnd.microsoft.icon ) diff --git a/guides/source/configuring.md b/guides/source/configuring.md index 706964090e..1ede31c1cd 100644 --- a/guides/source/configuring.md +++ b/guides/source/configuring.md @@ -813,7 +813,7 @@ normal Rails server. config.active_storage.paths[:ffprobe] = '/usr/local/bin/ffprobe' ``` -* `config.active_storage.variable_content_types` accepts an array of strings indicating the content types that Active Storage can transform through ImageMagick. The default is `%w(image/png image/gif image/jpg image/jpeg image/vnd.adobe.photoshop image/vnd.microsoft.icon)`. +* `config.active_storage.variable_content_types` accepts an array of strings indicating the content types that Active Storage can transform through ImageMagick. The default is `%w(image/png image/gif image/jpg image/jpeg image/pjpeg image/vnd.adobe.photoshop image/vnd.microsoft.icon)`. * `config.active_storage.content_types_to_serve_as_binary` accepts an array of strings indicating the content types that Active Storage will always serve as an attachment, rather than inline. The default is `%w(text/html text/javascript image/svg+xml application/postscript application/x-shockwave-flash text/xml application/xml application/xhtml+xml)`. |