aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/CHANGELOG.md
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2012-09-30 10:54:50 +0200
committerYves Senn <yves.senn@garaio.com>2012-10-01 16:13:25 +0200
commitbb0f4a1234e88fc4d100ad850f1efc18dd89cfc5 (patch)
tree2eaea3890669e1c753050798a31666aea6133422 /actionpack/CHANGELOG.md
parentd0ad97b9f5a0f2e9f77bcf512314873b2c7cfde2 (diff)
downloadrails-bb0f4a1234e88fc4d100ad850f1efc18dd89cfc5.tar.gz
rails-bb0f4a1234e88fc4d100ad850f1efc18dd89cfc5.tar.bz2
rails-bb0f4a1234e88fc4d100ad850f1efc18dd89cfc5.zip
prefix TemplateAssertions ivars (#7459)
Diffstat (limited to 'actionpack/CHANGELOG.md')
-rw-r--r--actionpack/CHANGELOG.md6
1 files changed, 6 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 4fecd38e3d..c8f1102776 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,5 +1,11 @@
## Rails 4.0.0 (unreleased) ##
+* Rename internal variables on ActionController::TemplateAssertions to prevent
+ naming collisions. @partials, @templates and @layouts are now prefixed with an underscore.
+ Fix #7459
+
+ *Yves Senn*
+
* `resource` and `resources` don't modify the passed options hash
Fix #7777