diff options
| author | George Claghorn <george@basecamp.com> | 2019-04-21 16:05:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-21 16:05:33 -0400 |
| commit | 142a8b97ef4619cb991666fec86db5d387443ffc (patch) | |
| tree | 5021e3d0ab4c481653c65e6099d2e620de5d8b12 /activestorage/lib/active_storage/engine.rb | |
| parent | 56ffb2654391fc5e312723a1c3c6d58a21016500 (diff) | |
| parent | bcf370d689673031073ba2ac5588afe41cc315c9 (diff) | |
| download | rails-142a8b97ef4619cb991666fec86db5d387443ffc.tar.gz rails-142a8b97ef4619cb991666fec86db5d387443ffc.tar.bz2 rails-142a8b97ef4619cb991666fec86db5d387443ffc.zip | |
Merge pull request #36051 from yoones/active-storage-bmp-variants-support
Allow ActiveStorage to generate variants of BMP images
Diffstat (limited to 'activestorage/lib/active_storage/engine.rb')
| -rw-r--r-- | activestorage/lib/active_storage/engine.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/activestorage/lib/active_storage/engine.rb b/activestorage/lib/active_storage/engine.rb index fc75a8f816..cbb205627e 100644 --- a/activestorage/lib/active_storage/engine.rb +++ b/activestorage/lib/active_storage/engine.rb @@ -33,6 +33,7 @@ module ActiveStorage image/jpeg image/pjpeg image/tiff + image/bmp image/vnd.adobe.photoshop image/vnd.microsoft.icon ) @@ -56,6 +57,7 @@ module ActiveStorage image/jpg image/jpeg image/tiff + image/bmp image/vnd.adobe.photoshop image/vnd.microsoft.icon application/pdf |