aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-08-21 18:39:37 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-08-21 18:39:37 -0300
commit8c6fcbc2b112f09f86c5fd6c262dd8e6e7d4fd4a (patch)
tree18322ce3bfed23470bcf983985b5bbdb88d88a31 /activesupport
parentd65a15dca6cd26ed1e40ec6313cf5ba740ba41e7 (diff)
downloadrails-8c6fcbc2b112f09f86c5fd6c262dd8e6e7d4fd4a.tar.gz
rails-8c6fcbc2b112f09f86c5fd6c262dd8e6e7d4fd4a.tar.bz2
rails-8c6fcbc2b112f09f86c5fd6c262dd8e6e7d4fd4a.zip
Add CHANGELOG entry for #3578 [ci skip]
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/CHANGELOG.md6
1 files changed, 6 insertions, 0 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 5f4bf70a08..4f57efb35d 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,5 +1,11 @@
## Rails 4.0.0 (unreleased) ##
+* Remove `j` alias for `ERB::Util#json_escape`.
+ The `j` alias is already used for `ActionView::Helpers::JavaScriptHelper#escape_javascript`
+ and both modules are included in the view context that would confuse the developers.
+
+ *Akira Matsuda*
+
* Replace deprecated `memcache-client` gem with `dalli` in ActiveSupport::Cache::MemCacheStore
*Guillermo Iguaran*