aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/CHANGELOG
diff options
context:
space:
mode:
authorNicholas Seckar <nseckar@gmail.com>2006-02-04 05:20:25 +0000
committerNicholas Seckar <nseckar@gmail.com>2006-02-04 05:20:25 +0000
commitdfa6e14af67f3c3532cf9645f6ce4b709f0b70f8 (patch)
treee2776483de29222e4e7f27f228729300d4bb7562 /actionpack/CHANGELOG
parentc77729fd23ccf169cafd1d72eb469fe1e4e42ea0 (diff)
downloadrails-dfa6e14af67f3c3532cf9645f6ce4b709f0b70f8.tar.gz
rails-dfa6e14af67f3c3532cf9645f6ce4b709f0b70f8.tar.bz2
rails-dfa6e14af67f3c3532cf9645f6ce4b709f0b70f8.zip
Fix controller resolution to avoid accidentally inheriting a controller from a parent module.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3530 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/CHANGELOG')
-rw-r--r--actionpack/CHANGELOG4
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 7c00e8d8dd..f61908a820 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,6 +1,8 @@
*SVN*
-* Set sweeper's @controller to nil after a request so that the controller may be collected between requests.
+* Fix controller resolution to avoid accidentally inheriting a controller from a parent module. [Nicholas Seckar]
+
+* Set sweeper's @controller to nil after a request so that the controller may be collected between requests. [Nicholas Seckar]
* Subclasses of ActionController::Caching::Sweeper should be Reloadable. [Rick Olson]