diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2016-02-18 10:47:47 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2016-02-18 10:47:47 -0800 |
| commit | fb8d01f1ef7da0a3c8c0173d6c3da59afe9d1ca5 (patch) | |
| tree | 258d75655ddcd9aacd2df0b74bb6c58404e3de9b /actionpack/lib/action_dispatch/http/mime_types.rb | |
| parent | e4c3225b2c9475ebfac474c7196dec2feb290e5a (diff) | |
| parent | 3bd9fe1708018e4e82f5d836cc6e047d9d9b5b55 (diff) | |
| download | rails-fb8d01f1ef7da0a3c8c0173d6c3da59afe9d1ca5.tar.gz rails-fb8d01f1ef7da0a3c8c0173d6c3da59afe9d1ca5.tar.bz2 rails-fb8d01f1ef7da0a3c8c0173d6c3da59afe9d1ca5.zip | |
Merge branch 'master' into treewip
* master: (27 commits)
move digest cache on to the DetailsKey object
remove object `hash` cache
[ci skip] fix suggested change-replace 'an' with 'the in Rails engine guide'
Missing documentation about hash algorithm option for MessageVerifier [ci skip]
set `skip_listen` option to dummy appplication
Fix the language in engines guide
Add accidentally removed `#` [ci skip]
fields_for_style needs to test for AC::Parameters
Fix indentation for code block in changelog
Remove accidentally duplicated change log title [ci skip]
partially revert 69009f4473637a44ade26d954ef5ddea6ff903f2
Remove needless `case_insensitive_comparison` in mysql2 adapter
modify to `error` also abort when specify fail fast option
Implement ActionController::Parameters#inspect
remove unused method
Remove unused Journey code
Add Action Cable CHANGELOG in release notes [ci skip]
Show proper error message when a non-relation object is passed to AR::Relation#or
Fix semantics of test names for finish option in batches_test
Fix typo
...
Conflicts:
actionview/lib/action_view/digestor.rb
Diffstat (limited to 'actionpack/lib/action_dispatch/http/mime_types.rb')
| -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 95881acac3..66cea88256 100644 --- a/actionpack/lib/action_dispatch/http/mime_types.rb +++ b/actionpack/lib/action_dispatch/http/mime_types.rb @@ -28,7 +28,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 application/vnd.api+json ) +Mime::Type.register "application/json", :json, %w( text/x-json application/jsonrequest ) Mime::Type.register "application/pdf", :pdf, [], %w(pdf) Mime::Type.register "application/zip", :zip, [], %w(zip) |