From d5b275db5c20669a7a9e598a70decf1316b39e03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Wed, 31 Oct 2012 00:31:47 -0200 Subject: Revert "Merge pull request #7659 from HugoLnx/template_error_no_matches_rebased" This reverts commit 7d17cd2cbfc086f5aa9dd636e1207eb130150428. Conflicts: actionpack/CHANGELOG.md Reason: This added a regression since people were relying on this buggy behavior. This will introduce back #3849 but we will be backward compatible in stable release. Fixes #8068. --- actionpack/CHANGELOG.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'actionpack/CHANGELOG.md') diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 0db1918e49..a257e8c600 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,10 +1,17 @@ ## Rails 3.2.9 (unreleased) ## +* Revert the `assert_template` fix to not pass with ever string that matches the template name. + This added a regression since people were relying on this buggy behavior. + This will introduce back #3849 but this stable release will be backward compatible. + Fixes #8068. + + *Rafael Mendonça França* + * 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 + Fixes #8068. *Rafael Mendonça França* -- cgit v1.2.3