diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-16 10:01:42 -0200 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-16 10:02:04 -0200 |
| commit | de20debe64df114090c32bcfcdc9f40dc34a79d2 (patch) | |
| tree | 0d42a101f9d5fe915a8a5f5d08dc2883d7cab5d8 /actionpack | |
| parent | 2bad4d2842cf84d83b4e8c2f4e9a9aa39179270b (diff) | |
| download | rails-de20debe64df114090c32bcfcdc9f40dc34a79d2.tar.gz rails-de20debe64df114090c32bcfcdc9f40dc34a79d2.tar.bz2 rails-de20debe64df114090c32bcfcdc9f40dc34a79d2.zip | |
Move changelog entry from #8235 to the top [ci skip]
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG.md | 14 |
1 files changed, 7 insertions, 7 deletions
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 |