aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorEduardo Bautista <me@eduardobautista.com>2015-05-27 21:51:04 -0500
committerEduardo Bautista <me@eduardobautista.com>2015-05-27 21:51:04 -0500
commit50b66313ad5d619900d9b18781cff3f06c28c0c1 (patch)
tree95ad99ea5ff655c1d79d96869773444e3fa2228f /actionpack
parentd0a370ec93c7e1118f3f58effe2e64712d3492bd (diff)
downloadrails-50b66313ad5d619900d9b18781cff3f06c28c0c1.tar.gz
rails-50b66313ad5d619900d9b18781cff3f06c28c0c1.tar.bz2
rails-50b66313ad5d619900d9b18781cff3f06c28c0c1.zip
Add application/vnd.api+json alias to the JSON MIME Type.
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_dispatch/http/mime_types.rb2
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 0e4da36038..01a10c693b 100644
--- a/actionpack/lib/action_dispatch/http/mime_types.rb
+++ b/actionpack/lib/action_dispatch/http/mime_types.rb
@@ -27,7 +27,7 @@ Mime::Type.register "application/x-www-form-urlencoded", :url_encoded_form
# http://www.ietf.org/rfc/rfc4627.txt
# http://www.json.org/JSONRequest.html
-Mime::Type.register "application/json", :json, %w( text/x-json application/jsonrequest )
+Mime::Type.register "application/json", :json, %w( text/x-json application/jsonrequest application/vnd.api+json )
Mime::Type.register "application/pdf", :pdf, [], %w(pdf)
Mime::Type.register "application/zip", :zip, [], %w(zip)