diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2010-04-30 13:38:57 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2010-04-30 13:46:37 -0700 |
| commit | 1d2257deebb97e5a27ef86acd29ecc6c4f5efa37 (patch) | |
| tree | 79d895e0b4b86388997a9baebfec6805463211e3 /actionpack/lib/action_controller/base.rb | |
| parent | 1ff954aaea764c16e812dadea44a07a3f4119905 (diff) | |
| parent | 8d236ccb8499beb5896754fd6b769c59afec52d2 (diff) | |
| download | rails-1d2257deebb97e5a27ef86acd29ecc6c4f5efa37.tar.gz rails-1d2257deebb97e5a27ef86acd29ecc6c4f5efa37.tar.bz2 rails-1d2257deebb97e5a27ef86acd29ecc6c4f5efa37.zip | |
Merge remote branch 'technoweenie/http_token_authentication'
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Diffstat (limited to 'actionpack/lib/action_controller/base.rb')
| -rw-r--r-- | actionpack/lib/action_controller/base.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 092fe98588..4297d9bbf6 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -35,6 +35,7 @@ module ActionController RecordIdentifier, HttpAuthentication::Basic::ControllerMethods, HttpAuthentication::Digest::ControllerMethods, + HttpAuthentication::Token::ControllerMethods, # Add instrumentations hooks at the bottom, to ensure they instrument # all the methods properly. |