aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/CHANGELOG.md
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/CHANGELOG.md')
-rw-r--r--actionpack/CHANGELOG.md5
1 files changed, 5 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index fd02492834..c8773c9179 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,5 +1,10 @@
## Rails 4.0.0 (unreleased) ##
+* `assert_template` can be used to assert on the same template with different locals
+ Fix #3675
+
+ *Yves Senn*
+
* Remove old asset tag concatenation (no longer needed now that we have the asset pipeline). *Josh Peek*
* Accept :remote as symbolic option for `link_to` helper. *Riley Lynch*