diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-06-25 19:34:20 -0300 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-06-25 19:34:20 -0300 |
| commit | dd9d8697466f111299fd9b7cf1cf565f20951e15 (patch) | |
| tree | 28940f6763c52b757e236174f7500b411751e366 /actionpack/CHANGELOG.md | |
| parent | f02d4ddc99ad70d1bd50ff70d37aed5f9cf49398 (diff) | |
| parent | 8ffd139edd062fe3e888895d4af80730a0798758 (diff) | |
| download | rails-dd9d8697466f111299fd9b7cf1cf565f20951e15.tar.gz rails-dd9d8697466f111299fd9b7cf1cf565f20951e15.tar.bz2 rails-dd9d8697466f111299fd9b7cf1cf565f20951e15.zip | |
Merge pull request #11000 from sbeckeriv/accept_header
Fix undefined method `ref' for nil:NilClass for bad accept headers
Diffstat (limited to 'actionpack/CHANGELOG.md')
| -rw-r--r-- | actionpack/CHANGELOG.md | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index e33accf854..05495179c3 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,3 +1,11 @@ +* Fix `Mime::Type.parse` when bad accepts header is looked up. Previously it + was setting `request.formats` with an array containing a `nil` value, which + raised an error when setting the controller formats. + + Fixes #10965 + + *Becker* + * Merge `:action` from routing scope and assign endpoint if both `:controller` and `:action` are present. The endpoint assignment only occurs if there is no `:to` present in the options hash so should only affect routes using the |