diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2012-08-09 16:57:49 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-08-09 16:57:49 -0700 |
| commit | 5c07be5f7fb7e6417c09751c7fb9bb98a63d9917 (patch) | |
| tree | 7e193c26c71883d917b563c1c2286cae710b2d89 /activesupport | |
| parent | d8cf713afabbd0c3cf8d6674b2d1a7f7c2a0e98c (diff) | |
| parent | 0228a73b1094a3e19ad291d2ce4789890c09578a (diff) | |
| download | rails-5c07be5f7fb7e6417c09751c7fb9bb98a63d9917.tar.gz rails-5c07be5f7fb7e6417c09751c7fb9bb98a63d9917.tar.bz2 rails-5c07be5f7fb7e6417c09751c7fb9bb98a63d9917.zip | |
Merge pull request #7310 from amerine/master
Add html_escape note to CHANGELOG
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/CHANGELOG.md | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index 3e5a53b0ff..6229b89a91 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -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* |