aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal/compatibility.rb
diff options
context:
space:
mode:
authorCarlhuda <carlhuda@engineyard.com>2010-03-04 11:58:30 -0800
committerCarlhuda <carlhuda@engineyard.com>2010-03-04 11:58:30 -0800
commit17769696279810c6c24a10b0d47f9b712205f0ce (patch)
tree86093a3cfed5e3bcac393284f79b4f9c046d0250 /actionpack/lib/action_controller/metal/compatibility.rb
parentc0c1599fb15fa4bb9f311c92c88d7c83795388fb (diff)
downloadrails-17769696279810c6c24a10b0d47f9b712205f0ce.tar.gz
rails-17769696279810c6c24a10b0d47f9b712205f0ce.tar.bz2
rails-17769696279810c6c24a10b0d47f9b712205f0ce.zip
Move session and session_store onto ActionDispatch and add deprecation warnings
Diffstat (limited to 'actionpack/lib/action_controller/metal/compatibility.rb')
-rw-r--r--actionpack/lib/action_controller/metal/compatibility.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb
index 4c2136de8a..024c58ffc4 100644
--- a/actionpack/lib/action_controller/metal/compatibility.rb
+++ b/actionpack/lib/action_controller/metal/compatibility.rb
@@ -158,6 +158,12 @@ module ActionController
Rails.application.config.action_dispatch.ip_spoofing_check = value
end
+ def session=(value)
+ ActiveSupport::Deprecation.warn "ActionController::Base.session= is deprecated. " <<
+ "Please configure it on your application with config.action_dispatch.session=", caller
+ Rails.application.config.action_dispatch.session = value.delete(:disabled) ? nil : value
+ end
+
def rescue_action(env)
raise env["action_dispatch.rescue.exception"]
end