diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2008-11-20 08:52:48 +0100 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2008-11-20 08:52:48 +0100 |
| commit | 206c5643aae40b0884d42fdb8caeb3f763936fa9 (patch) | |
| tree | 608f5cc7daab7b58b3d159429c595303e7e1c7d4 /actionpack/lib/action_controller.rb | |
| parent | fb1eebac940d0648d1640d20a24f085d901d6f30 (diff) | |
| parent | 20a346170cf3922d16e265487cfb1abcc85383c1 (diff) | |
| download | rails-206c5643aae40b0884d42fdb8caeb3f763936fa9.tar.gz rails-206c5643aae40b0884d42fdb8caeb3f763936fa9.tar.bz2 rails-206c5643aae40b0884d42fdb8caeb3f763936fa9.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller.rb')
| -rw-r--r-- | actionpack/lib/action_controller.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb index 2efd0dad2e..c2f064ae9e 100644 --- a/actionpack/lib/action_controller.rb +++ b/actionpack/lib/action_controller.rb @@ -49,7 +49,6 @@ require 'action_controller/verification' require 'action_controller/streaming' require 'action_controller/session_management' require 'action_controller/http_authentication' -require 'action_controller/components' require 'action_controller/rack_process' require 'action_controller/record_identifier' require 'action_controller/request_forgery_protection' @@ -72,7 +71,6 @@ ActionController::Base.class_eval do include ActionController::Streaming include ActionController::SessionManagement include ActionController::HttpAuthentication::Basic::ControllerMethods - include ActionController::Components include ActionController::RecordIdentifier include ActionController::RequestForgeryProtection include ActionController::Translation |