diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-05-11 07:27:41 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-05-11 07:27:41 -0700 |
| commit | 8ec1f30cfdea6c80db1434a9f96c28bb119689d0 (patch) | |
| tree | 864d11da2ad39a95329aab5cbeefcc9fe3efca48 /activesupport | |
| parent | 0fde84c0f8c0db40110c27890525221751015e6d (diff) | |
| parent | 295bf413e57fb0b4da5a73319236403eba493734 (diff) | |
| download | rails-8ec1f30cfdea6c80db1434a9f96c28bb119689d0.tar.gz rails-8ec1f30cfdea6c80db1434a9f96c28bb119689d0.tar.bz2 rails-8ec1f30cfdea6c80db1434a9f96c28bb119689d0.zip | |
Merge pull request #516 from gucki/master
add missing require for ordered_hash dependency
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/json/encoding.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/json/encoding.rb b/activesupport/lib/active_support/json/encoding.rb index 1fafc36ee8..d22fe14b33 100644 --- a/activesupport/lib/active_support/json/encoding.rb +++ b/activesupport/lib/active_support/json/encoding.rb @@ -2,6 +2,7 @@ require 'active_support/core_ext/object/to_json' require 'active_support/core_ext/module/delegation' require 'active_support/deprecation' require 'active_support/json/variable' +require 'active_support/ordered_hash' require 'bigdecimal' require 'active_support/core_ext/big_decimal/conversions' # for #to_s |