aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--actionpack/lib/action_controller/caching.rb2
-rw-r--r--actionpack/lib/action_controller/session/active_record_store.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb
index 6751e2b3e8..3f54e5d383 100644
--- a/actionpack/lib/action_controller/caching.rb
+++ b/actionpack/lib/action_controller/caching.rb
@@ -522,7 +522,7 @@ module ActionController #:nodoc:
attr_accessor :controller
# ActiveRecord::Observer will mark this class as reloadable even though it should be
- def self.included_modules(include_super = true)
+ def self.included_modules
super() - [ Reloadable ]
end
diff --git a/actionpack/lib/action_controller/session/active_record_store.rb b/actionpack/lib/action_controller/session/active_record_store.rb
index 2a9a269adb..02384021d8 100644
--- a/actionpack/lib/action_controller/session/active_record_store.rb
+++ b/actionpack/lib/action_controller/session/active_record_store.rb
@@ -66,7 +66,7 @@ class CGI
class << self
# Don't try to reload ARStore::Session in dev mode.
- def included_modules(include_super = true)
+ def included_modules
super() - [ Reloadable ]
end