Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Move changelog entry from #8235 to the top [ci skip]

  • Loading branch information...
commit de20debe64df114090c32bcfcdc9f40dc34a79d2 1 parent 2bad4d2
@carlosantoniodasilva carlosantoniodasilva authored
Showing with 7 additions and 7 deletions.
  1. +7 −7 actionpack/CHANGELOG.md
View
14 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
Please sign in to comment.
Something went wrong with that request. Please try again.