diff options
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller/caching.rb | 4 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/session/active_record_store.rb | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb index df25fed3b2..e62fe11a19 100644 --- a/actionpack/lib/action_controller/caching.rb +++ b/actionpack/lib/action_controller/caching.rb @@ -523,8 +523,8 @@ module ActionController #:nodoc: # ActiveRecord::Observer will mark this class as reloadable even though it should not be. # However, subclasses of ActionController::Caching::Sweeper should be Reloadable - def self.included_modules - self == Sweeper ? super() - [ Reloadable ] : super() + def self.reloadable? #:nodoc: + self != Sweeper end def before(controller) diff --git a/actionpack/lib/action_controller/session/active_record_store.rb b/actionpack/lib/action_controller/session/active_record_store.rb index 02384021d8..7642320747 100644 --- a/actionpack/lib/action_controller/session/active_record_store.rb +++ b/actionpack/lib/action_controller/session/active_record_store.rb @@ -66,11 +66,6 @@ class CGI class << self # Don't try to reload ARStore::Session in dev mode. - def included_modules - super() - [ Reloadable ] - end - - # Don't try to reload ARStore::Session in dev mode. def reloadable? #:nodoc: false end |