diff options
| author | Xavier Noria <fxn@hashref.com> | 2012-01-02 14:21:13 -0800 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2012-01-02 14:21:13 -0800 |
| commit | e369c4e67f1bc56275960033ed500f12ae70f8a1 (patch) | |
| tree | 25c31221f3f213f4e42d048934e703b544dfe53f /actionpack/lib | |
| parent | 7bdfbac580f7b03953f2aabf610d98c437da376e (diff) | |
| parent | 4f440a38330deea048e8328431c0984a04a90bfa (diff) | |
| download | rails-e369c4e67f1bc56275960033ed500f12ae70f8a1.tar.gz rails-e369c4e67f1bc56275960033ed500f12ae70f8a1.tar.bz2 rails-e369c4e67f1bc56275960033ed500f12ae70f8a1.zip | |
Merge pull request #4268 from lest/3-2-deprecate-activesupport-base64
fix base64 requires
Diffstat (limited to 'actionpack/lib')
| -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 3be2e840b8..edff40a483 100644 --- a/actionpack/lib/action_controller/metal/http_authentication.rb +++ b/actionpack/lib/action_controller/metal/http_authentication.rb @@ -1,4 +1,4 @@ -require 'base64' +require 'active_support/base64' require 'active_support/core_ext/object/blank' module ActionController |