Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #4743 from atd/patch-1

Add 'image/pjpeg' format used by IE
  • Loading branch information...
commit 677e06c20f6df6c44f44af9ba95390558e67a9bc 2 parents ec4440f + 5dd80db
@josevalim josevalim authored
Showing with 1 addition and 1 deletion.
  1. +1 −1  actionpack/lib/action_dispatch/http/mime_types.rb
View
2  actionpack/lib/action_dispatch/http/mime_types.rb
@@ -9,7 +9,7 @@
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)
Please sign in to comment.
Something went wrong with that request. Please try again.