diff options
| author | José Valim <jose.valim@gmail.com> | 2012-01-02 13:11:37 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-01-02 13:11:37 -0800 |
| commit | 6de1b2ad89bdc0d7348e2805a7ac66c9d6e89653 (patch) | |
| tree | 64eaaddaa4ce80c3858f618d640910abb9427f9c | |
| parent | 44df252382cc2301364495ff65563d23bcc1b070 (diff) | |
| parent | 634c03403d0791cc2ba34714afe7cc1c8af58de6 (diff) | |
| download | rails-6de1b2ad89bdc0d7348e2805a7ac66c9d6e89653.tar.gz rails-6de1b2ad89bdc0d7348e2805a7ac66c9d6e89653.tar.bz2 rails-6de1b2ad89bdc0d7348e2805a7ac66c9d6e89653.zip | |
Merge pull request #4266 from lest/deprecate-activesupport-base64
fix base64 require
| -rw-r--r-- | actionpack/lib/action_controller/metal/http_authentication.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/http_authentication.rb b/actionpack/lib/action_controller/metal/http_authentication.rb index 09ff376a91..4972c6bede 100644 --- a/actionpack/lib/action_controller/metal/http_authentication.rb +++ b/actionpack/lib/action_controller/metal/http_authentication.rb @@ -1,4 +1,4 @@ -require 'active_support/base64' +require 'base64' require 'active_support/core_ext/object/blank' module ActionController |