From 8c6fcbc2b112f09f86c5fd6c262dd8e6e7d4fd4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Tue, 21 Aug 2012 18:39:37 -0300
Subject: Add CHANGELOG entry for #3578 [ci skip]

---
 activesupport/CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'activesupport/CHANGELOG.md')

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*
-- 
cgit v1.2.3