diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2007-05-08 05:48:18 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2007-05-08 05:48:18 +0000 |
commit | 20eb59ad8a9e97a5bbb68df1ba2f15914c26a358 (patch) | |
tree | b8821fba747df8e787897101bafc5916b3df5d7a /actionpack/lib/action_controller.rb | |
parent | 5a9dc1231c337f20a53e22d01dcddf7953ec549d (diff) | |
download | rails-20eb59ad8a9e97a5bbb68df1ba2f15914c26a358.tar.gz rails-20eb59ad8a9e97a5bbb68df1ba2f15914c26a358.tar.bz2 rails-20eb59ad8a9e97a5bbb68df1ba2f15914c26a358.zip |
Included the HttpAuthentication plugin as part of core (ActionController::HttpAuthentication::Basic) [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6699 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller.rb')
-rwxr-xr-x | actionpack/lib/action_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb index a0bdf4995c..96192809e5 100755 --- a/actionpack/lib/action_controller.rb +++ b/actionpack/lib/action_controller.rb @@ -53,6 +53,7 @@ require 'action_controller/caching' 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/record_identifier' require 'action_controller/macros/auto_complete' @@ -76,6 +77,7 @@ ActionController::Base.class_eval do include ActionController::Verification include ActionController::Streaming include ActionController::SessionManagement + include ActionController::HttpAuthentication::Basic::ControllerMethods include ActionController::Components include ActionController::RecordIdentifier include ActionController::Macros::AutoComplete |