diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2018-11-23 16:53:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-23 16:53:30 -0500 |
| commit | 437d20916f80eb905a1c028db4bd53304c293e61 (patch) | |
| tree | ce37e829be7cadd4e2c9795fca584e0c03981f32 /activestorage | |
| parent | 246ee77eef7b799a647beb2ff704a9a5867bec66 (diff) | |
| parent | 455a122ef0135bd133b51014467211bc9a0a11f4 (diff) | |
| download | rails-437d20916f80eb905a1c028db4bd53304c293e61.tar.gz rails-437d20916f80eb905a1c028db4bd53304c293e61.tar.bz2 rails-437d20916f80eb905a1c028db4bd53304c293e61.zip | |
Merge pull request #34455 from minimalweb/progressive_jpeg_inclusion_as_variable_content_type
Add progressive JPG MIME-type to default variable content types
Diffstat (limited to 'activestorage')
| -rw-r--r-- | activestorage/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | activestorage/lib/active_storage/engine.rb | 1 |
2 files changed, 5 insertions, 0 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 ) |