diff options
| author | José Valim <jose.valim@plataformatec.com.br> | 2012-11-16 00:33:14 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@plataformatec.com.br> | 2012-11-16 00:33:14 -0800 |
| commit | 4a4de567b45ff28035419bc2d92f9b206e3c0a66 (patch) | |
| tree | a4dc887d3bd1a3bb3cb58866b2b377661eacb6fe /actionpack/CHANGELOG.md | |
| parent | 44f12bbba08071178ec256c03eecadacdf35dccf (diff) | |
| parent | 5f189f41258b83d49012ec5a0678d827327e7543 (diff) | |
| download | rails-4a4de567b45ff28035419bc2d92f9b206e3c0a66.tar.gz rails-4a4de567b45ff28035419bc2d92f9b206e3c0a66.tar.bz2 rails-4a4de567b45ff28035419bc2d92f9b206e3c0a66.zip | |
Merge pull request #8235 from tilsammans/dont_escape_actionmailer_when_plaintext
Introduce `ActionView::Template::Handlers::ERB.escape_whitelist`
Diffstat (limited to 'actionpack/CHANGELOG.md')
| -rw-r--r-- | actionpack/CHANGELOG.md | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index e04eac739d..78ef809196 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -43,6 +43,13 @@ *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 |