diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2009-12-20 18:32:35 -0800 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2009-12-20 18:32:35 -0800 |
commit | 91ce8d8b7f4e7ab93dda159595debadd4f659ab9 (patch) | |
tree | 88e7592f0191eec5a66cdf45375b114d01018fcc /actionpack/lib/action_controller/base.rb | |
parent | cf9d6a95e805bdddfa9c6b541631d51b3165bf23 (diff) | |
parent | 29c8a43056f40759a8c64cbcbd4e71d4283b233d (diff) | |
download | rails-91ce8d8b7f4e7ab93dda159595debadd4f659ab9.tar.gz rails-91ce8d8b7f4e7ab93dda159595debadd4f659ab9.tar.bz2 rails-91ce8d8b7f4e7ab93dda159595debadd4f659ab9.zip |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/base.rb')
-rw-r--r-- | actionpack/lib/action_controller/base.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index d84705434d..e6cde7fd35 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -13,7 +13,7 @@ module ActionController include ActionController::Renderers::All include ActionController::Layouts include ActionController::ConditionalGet - include ActionController::RackConvenience + include ActionController::RackDelegation include ActionController::Benchmarking include ActionController::Configuration @@ -26,7 +26,6 @@ module ActionController include ActionController::Compatibility include ActionController::Cookies - include ActionController::Session include ActionController::Flash include ActionController::Verification include ActionController::RequestForgeryProtection |