diff options
| author | José Valim <jose.valim@plataformatec.com.br> | 2012-01-29 08:57:37 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@plataformatec.com.br> | 2012-01-29 08:57:37 -0800 |
| commit | 677e06c20f6df6c44f44af9ba95390558e67a9bc (patch) | |
| tree | 526777409c0d457f8a3bb627a0ccd535c28d8f96 | |
| parent | ec4440fd4e886bc491726070b9fc44938f8798ee (diff) | |
| parent | 5dd80db4ea8989fa69629cc682766e000ee83d49 (diff) | |
| download | rails-677e06c20f6df6c44f44af9ba95390558e67a9bc.tar.gz rails-677e06c20f6df6c44f44af9ba95390558e67a9bc.tar.bz2 rails-677e06c20f6df6c44f44af9ba95390558e67a9bc.zip | |
Merge pull request #4743 from atd/patch-1
Add 'image/pjpeg' format used by IE
| -rw-r--r-- | actionpack/lib/action_dispatch/http/mime_types.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/http/mime_types.rb b/actionpack/lib/action_dispatch/http/mime_types.rb index 3da4f91051..a6b3aee5e7 100644 --- a/actionpack/lib/action_dispatch/http/mime_types.rb +++ b/actionpack/lib/action_dispatch/http/mime_types.rb @@ -9,7 +9,7 @@ Mime::Type.register "text/calendar", :ics Mime::Type.register "text/csv", :csv Mime::Type.register "image/png", :png, [], %w(png) -Mime::Type.register "image/jpeg", :jpeg, [], %w(jpg jpeg jpe) +Mime::Type.register "image/jpeg", :jpeg, [], %w(jpg jpeg jpe pjpeg) Mime::Type.register "image/gif", :gif, [], %w(gif) Mime::Type.register "image/bmp", :bmp, [], %w(bmp) Mime::Type.register "image/tiff", :tiff, [], %w(tif tiff) |