Browse files

Merge pull request #7310 from amerine/master

Add html_escape note to CHANGELOG
  • Loading branch information...
2 parents d8cf713 + 0228a73 commit 5c07be5f7fb7e6417c09751c7fb9bb98a63d9917 @spastorino spastorino committed Aug 9, 2012
Showing with 1 addition and 8 deletions.
  1. +1 −8 activesupport/
@@ -1,13 +1,6 @@
## Rails 4.0.0 (unreleased) ##
-* ActiveSupport::JSON::Variable is deprecated. Define your own #as_json and #encode_json methods
- for custom JSON string literals. *Erich Menge*
-* Add String#indent. *fxn & Ace Suares*
-* Inflections can now be defined per locale. `singularize` and `pluralize` accept locale as an extra argument. *David Celis*
-* `Object#try` will now return nil instead of raise a NoMethodError if the receiving object does not implement the method, but you can still get the old behavior by using the new `Object#try!` *DHH*
+* `ERB::Util.html_escape` now escapes single quotes. *Santiago Pastorino*
* `Time#change` now works with time values with offsets other than UTC or the local time zone. *Andrew White*

0 comments on commit 5c07be5

Please sign in to comment.