diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-30 23:51:10 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-30 23:52:51 -0200 |
| commit | 6b7cd20ab39b16cb5111ecca71ffea4fd95a0066 (patch) | |
| tree | b8e8ea36f1fe78e01c95caf68d541f273922e243 /actionpack/CHANGELOG.md | |
| parent | 37c60c91f3224baea579fca1df7a580d85ec143f (diff) | |
| download | rails-6b7cd20ab39b16cb5111ecca71ffea4fd95a0066.tar.gz rails-6b7cd20ab39b16cb5111ecca71ffea4fd95a0066.tar.bz2 rails-6b7cd20ab39b16cb5111ecca71ffea4fd95a0066.zip | |
Revert "Merge pull request #7797 from senny/7459_prefix_tempalte_assertion_variables"
This reverts commit 2bad605873b5b720d77ae6388a995827ab7fe705.
Conflicts:
actionpack/CHANGELOG.md
Reason: This added a regression related with shoulda-matchers, since it
is expecting the instance variable @layouts
See https://github.com/thoughtbot/shoulda-matchers/blob/9e1188eea68c47d9a56ce6280e45027da6187ab1/lib/shoulda/matchers/action_controller/render_with_layout_matcher.rb#L74
This will introduce back #7459 but this stable release will be backward compatible.
Related with #8068.
Diffstat (limited to 'actionpack/CHANGELOG.md')
| -rw-r--r-- | actionpack/CHANGELOG.md | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 1d38e33874..0db1918e49 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,5 +1,13 @@ ## Rails 3.2.9 (unreleased) ## +* Revert the rename of internal variable on ActionController::TemplateAssertions to prevent + naming collisions. This added a regression related with shoulda-matchers, since it is + expecting the [instance variable @layouts](https://github.com/thoughtbot/shoulda-matchers/blob/9e1188eea68c47d9a56ce6280e45027da6187ab1/lib/shoulda/matchers/action_controller/render_with_layout_matcher.rb#L74). + This will introduce back #7459 but this stable release will be backward compatible. + Fixes #8068 + + *Rafael Mendonça França* + * Accept :remote as symbolic option for `link_to` helper. *Riley Lynch* * Warn when the `:locals` option is passed to `assert_template` outside of a view test case |