From 55cbb85fb7b7f4eaaa681e2a74cc8aca225097b7 Mon Sep 17 00:00:00 2001 From: Nicholas Jakobsen Date: Wed, 7 Aug 2013 12:43:22 -0700 Subject: Execute conditional procs on controller filters only for current action. :only and :except options for controller filters are now added before :if and :unless. This prevents running :if and :unless procs when not on the specified. Closes #11786. --- actionpack/CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'actionpack/CHANGELOG.md') diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index d848095e01..4e090ed526 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,3 +1,10 @@ +* Fix an issue where :if and :unless controller action procs were being run + before checking for the correct action in the :only and :unless options. + + Fixes #11799 + + *Nicholas Jakobsen* + * Fix an issue where `assert_dom_equal` and `assert_dom_not_equal` were ignoring the passed failure message argument. -- cgit v1.2.3