diff options
| author | Sergey Nartimov <just.lest@gmail.com> | 2012-01-03 01:04:03 +0300 |
|---|---|---|
| committer | Sergey Nartimov <just.lest@gmail.com> | 2012-01-03 01:18:34 +0300 |
| commit | 4f440a38330deea048e8328431c0984a04a90bfa (patch) | |
| tree | 25c31221f3f213f4e42d048934e703b544dfe53f /activesupport/lib/active_support | |
| parent | 7bdfbac580f7b03953f2aabf610d98c437da376e (diff) | |
| download | rails-4f440a38330deea048e8328431c0984a04a90bfa.tar.gz rails-4f440a38330deea048e8328431c0984a04a90bfa.tar.bz2 rails-4f440a38330deea048e8328431c0984a04a90bfa.zip | |
fix base64 requires
Diffstat (limited to 'activesupport/lib/active_support')
| -rw-r--r-- | activesupport/lib/active_support/message_encryptor.rb | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/message_verifier.rb | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/xml_mini.rb | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/message_encryptor.rb b/activesupport/lib/active_support/message_encryptor.rb index 535eec4485..abe9c938af 100644 --- a/activesupport/lib/active_support/message_encryptor.rb +++ b/activesupport/lib/active_support/message_encryptor.rb @@ -1,5 +1,5 @@ require 'openssl' -require 'base64' +require 'active_support/base64' module ActiveSupport # MessageEncryptor is a simple way to encrypt values which get stored somewhere diff --git a/activesupport/lib/active_support/message_verifier.rb b/activesupport/lib/active_support/message_verifier.rb index bbb239e194..be5b7ef79f 100644 --- a/activesupport/lib/active_support/message_verifier.rb +++ b/activesupport/lib/active_support/message_verifier.rb @@ -1,4 +1,4 @@ -require 'base64' +require 'active_support/base64' require 'active_support/core_ext/object/blank' module ActiveSupport diff --git a/activesupport/lib/active_support/xml_mini.rb b/activesupport/lib/active_support/xml_mini.rb index 4df3fd0efa..a4ac1d7041 100644 --- a/activesupport/lib/active_support/xml_mini.rb +++ b/activesupport/lib/active_support/xml_mini.rb @@ -1,4 +1,5 @@ require 'time' +require 'active_support/base64' require 'active_support/core_ext/module/delegation' require 'active_support/core_ext/string/inflections' |