diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-05-27 23:55:45 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-05-27 23:55:45 -0300 |
| commit | 902360b77f51ade0eedcc6b0f8db6cd30aa97582 (patch) | |
| tree | 578673ec9a0fad36e42169b843ff8f1691d77e6b | |
| parent | d81f147003edcb788e18b36d6351e8787c46b2fc (diff) | |
| parent | 50b66313ad5d619900d9b18781cff3f06c28c0c1 (diff) | |
| download | rails-902360b77f51ade0eedcc6b0f8db6cd30aa97582.tar.gz rails-902360b77f51ade0eedcc6b0f8db6cd30aa97582.tar.bz2 rails-902360b77f51ade0eedcc6b0f8db6cd30aa97582.zip | |
Merge pull request #20329 from EduardoBautista/json-api-support
Add application/vnd.api+json alias to the JSON MIME Type.
| -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 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) |