diff options
| author | Nicholas Jakobsen <nicholas.jakobsen@gmail.com> | 2013-08-07 12:43:22 -0700 |
|---|---|---|
| committer | Nicholas Jakobsen <nicholas.jakobsen@gmail.com> | 2013-08-10 09:13:20 -0700 |
| commit | 55cbb85fb7b7f4eaaa681e2a74cc8aca225097b7 (patch) | |
| tree | 525a17d52ba95935cfcf852a2ed7153dd62ce264 /actionpack/CHANGELOG.md | |
| parent | 806bc2add8a0807ca45fb0945856bec89a321fc8 (diff) | |
| download | rails-55cbb85fb7b7f4eaaa681e2a74cc8aca225097b7.tar.gz rails-55cbb85fb7b7f4eaaa681e2a74cc8aca225097b7.tar.bz2 rails-55cbb85fb7b7f4eaaa681e2a74cc8aca225097b7.zip | |
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.
Diffstat (limited to 'actionpack/CHANGELOG.md')
| -rw-r--r-- | actionpack/CHANGELOG.md | 7 |
1 files changed, 7 insertions, 0 deletions
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. |