diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-01 19:30:08 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-01 23:58:05 -0300 |
| commit | 2bad605873b5b720d77ae6388a995827ab7fe705 (patch) | |
| tree | f751fa5d7c4c8edd6605126ea24cd6db593e4a3e /actionpack/CHANGELOG.md | |
| parent | 3b5bc8d71ba97ddc254ab3dc81893c82e81a783b (diff) | |
| download | rails-2bad605873b5b720d77ae6388a995827ab7fe705.tar.gz rails-2bad605873b5b720d77ae6388a995827ab7fe705.tar.bz2 rails-2bad605873b5b720d77ae6388a995827ab7fe705.zip | |
Merge pull request #7797 from senny/7459_prefix_tempalte_assertion_variables
prefix TemplateAssertions ivars.
Closes #7459
Conflicts:
actionpack/lib/action_controller/test_case.rb
actionpack/lib/action_view/test_case.rb
Diffstat (limited to 'actionpack/CHANGELOG.md')
| -rw-r--r-- | actionpack/CHANGELOG.md | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index c5b478222d..fd54315d96 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,5 +1,11 @@ ## Rails 3.2.9 (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 |