aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2012-08-09 16:57:38 -0700
committerSantiago Pastorino <santiago@wyeworks.com>2012-08-09 16:57:38 -0700
commitae2383d90a9646e36c8b5d92801fba284ea62ec0 (patch)
tree5e409cec088c2b7e800640a42b261d21b17dacb7
parent7987e7419a75b5677841c4f215791a73083a154a (diff)
parente8c0d737efd344402ccc9bba9b51d0bf00098ecb (diff)
downloadrails-ae2383d90a9646e36c8b5d92801fba284ea62ec0.tar.gz
rails-ae2383d90a9646e36c8b5d92801fba284ea62ec0.tar.bz2
rails-ae2383d90a9646e36c8b5d92801fba284ea62ec0.zip
Merge pull request #7309 from amerine/3-2-stable
Add html_escape note to CHANGELOG
-rw-r--r--activesupport/CHANGELOG.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 8e7b780dd6..920ecf5053 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -4,6 +4,8 @@
* Reverted the deprecation of ActiveSupport::JSON::Variable. *Rafael Mendonça França*
+* ERB::Util.html_escape now escapes single quotes. *Santiago Pastorino*
+
## Rails 3.2.7 (Jul 26, 2012) ##
* Hash#fetch(fetch) is not the same as doing hash[key]