diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-12-03 02:34:11 -0500 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-12-03 02:34:11 -0500 |
| commit | 9ed3aab6927471078888ff51c255561350946344 (patch) | |
| tree | 337d71804afb740c0def41359239186fcb28317b /actionpack/CHANGELOG.md | |
| parent | c48a0cac626b4e32d7abfa9f4f1fae16568157d9 (diff) | |
| parent | 43962d6ec50f918c9970bd3cd4b6ee5c7f7426ed (diff) | |
| download | rails-9ed3aab6927471078888ff51c255561350946344.tar.gz rails-9ed3aab6927471078888ff51c255561350946344.tar.bz2 rails-9ed3aab6927471078888ff51c255561350946344.zip | |
Merge branch 'format_localized_template' of https://github.com/acapilleri/rails
Conflicts:
actionpack/CHANGELOG.md
Diffstat (limited to 'actionpack/CHANGELOG.md')
| -rw-r--r-- | actionpack/CHANGELOG.md | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index cfefeb23ce..330d015733 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,3 +1,12 @@ +* Fix header Content-Type: #<Mime::NullType:...> in localized template + + When localized template has no format in the template name, + now the response has the default and correct `content-type`. + + Fix #13064. + + *Angelo Capilleri* + * Try to escape each part of a url correctly when using a redirect route. Fixes #13110. |