From de20debe64df114090c32bcfcdc9f40dc34a79d2 Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Fri, 16 Nov 2012 10:01:42 -0200 Subject: Move changelog entry from #8235 to the top [ci skip] --- actionpack/CHANGELOG.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'actionpack') diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 78ef809196..1ebc75ed2f 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,5 +1,12 @@ ## Rails 4.0.0 (unreleased) ## +* Introduce `ActionView::Template::Handlers::ERB.escape_whitelist`. This is a list + of mime types where template text is not html escaped by default. It prevents `Jack & Joe` + from rendering as `Jack & Joe` for the whitelisted mime types. The default whitelist + contains text/plain. Fix #7976 + + *Joost Baaij* + * Fix input name when `:multiple => true` and `:index` are set. Before: @@ -43,13 +50,6 @@ *Josh Peek* -* Introduce `ActionView::Template::Handlers::ERB.escape_whitelist`. This is a list - of mime types where template text is not html escaped by default. It prevents `Jack & Joe` - from rendering as `Jack & Joe` for the whitelisted mime types. The default whitelist - contains text/plain. Fix #7976 - - *Joost Baaij* - * `assert_template` can be used to assert on the same template with different locals Fix #3675 -- cgit v1.2.3