diff options
author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2017-11-29 01:28:22 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-29 01:28:22 -0500 |
commit | 17661b8cb2591fda5370f7bf8df53ec78b0cdda4 (patch) | |
tree | 292662415fd57e90548487f4e71edfaa5d6837b8 /actionpack/lib | |
parent | 02b5b1a609a582efafa0d619116109ca4a4e8abd (diff) | |
parent | af10a39f88488109cecc6e425e08c083a7e55289 (diff) | |
download | rails-17661b8cb2591fda5370f7bf8df53ec78b0cdda4.tar.gz rails-17661b8cb2591fda5370f7bf8df53ec78b0cdda4.tar.bz2 rails-17661b8cb2591fda5370f7bf8df53ec78b0cdda4.zip |
Merge pull request #31251 from rails/preload_link_tag
Add preload_link_tag helper.
Diffstat (limited to 'actionpack/lib')
-rw-r--r-- | actionpack/lib/action_dispatch/http/mime_types.rb | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/http/mime_types.rb b/actionpack/lib/action_dispatch/http/mime_types.rb index f8e6fca36d..9f8db397fd 100644 --- a/actionpack/lib/action_dispatch/http/mime_types.rb +++ b/actionpack/lib/action_dispatch/http/mime_types.rb @@ -10,6 +10,7 @@ Mime::Type.register "text/css", :css Mime::Type.register "text/calendar", :ics Mime::Type.register "text/csv", :csv Mime::Type.register "text/vcard", :vcf +Mime::Type.register "text/vtt", :vtt, %w(vtt) Mime::Type.register "image/png", :png, [], %w(png) Mime::Type.register "image/jpeg", :jpeg, [], %w(jpg jpeg jpe pjpeg) @@ -17,8 +18,25 @@ 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) Mime::Type.register "image/svg+xml", :svg +Mime::Type.register "image/webp", :webp, [], %w(webp) -Mime::Type.register "video/mpeg", :mpeg, [], %w(mpg mpeg mpe) +Mime::Type.register "audio/mpeg", :mpg, [], %w(mp1 mp2 mp3) +Mime::Type.register "audio/webm", :weba, [], %w(weba) +Mime::Type.register "audio/ogg", :ogg, [], %w(oga ogg spx opus) +Mime::Type.register "audio/aac", :acc, [], %w(aac) +Mime::Type.register "audio/mp4", :mp4, [], %w(m4a mpg4) +Mime::Type.register "audio/flac", :flac, [], %w(flac) + +Mime::Type.register "video/webm", :webm, [], %w(webm) +Mime::Type.register "video/mp4", :mp4, [], %w(mp4 m4v) +Mime::Type.register "video/ogg", :ogv, [], %w(ogv) + +Mime::Type.register "application/ogx", :ogx, [], %w(ogx) + +Mime::Type.register "font/otf", :otf, [], %w(otf) +Mime::Type.register "font/ttf", :ttf, [], %w(ttf) +Mime::Type.register "font/woff", :woff, [], %w(woff) +Mime::Type.register "font/woff2", :woff2, [], %w(woff2) Mime::Type.register "application/xml", :xml, %w( text/xml application/x-xml ) Mime::Type.register "application/rss+xml", :rss |