diff options
| author | Joshua Peek <josh@joshpeek.com> | 2008-11-24 11:52:29 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2008-11-24 11:52:29 -0600 |
| commit | fffb1da3f22852c722dbc4436ec7c924435d29a5 (patch) | |
| tree | d31d10a47fa818328700cb123878f38328c6679b | |
| parent | 703fecb4fc81c3a975a53c9c4534f40193bd1ab9 (diff) | |
| download | rails-fffb1da3f22852c722dbc4436ec7c924435d29a5.tar.gz rails-fffb1da3f22852c722dbc4436ec7c924435d29a5.tar.bz2 rails-fffb1da3f22852c722dbc4436ec7c924435d29a5.zip | |
require json lib when serialization is loaded
| -rw-r--r-- | activerecord/lib/active_record/serialization.rb | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/serialization.rb b/activerecord/lib/active_record/serialization.rb index cef067de5f..870b4b2dd4 100644 --- a/activerecord/lib/active_record/serialization.rb +++ b/activerecord/lib/active_record/serialization.rb @@ -1,3 +1,5 @@ +require 'active_support/json' + module ActiveRecord #:nodoc: module Serialization class Serializer #:nodoc: diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb index b9b41ffa8b..8068538e33 100644 --- a/activesupport/lib/active_support.rb +++ b/activesupport/lib/active_support.rb @@ -23,7 +23,7 @@ module ActiveSupport def self.load_all! - [Dependencies, Deprecation, Gzip, JSON, MessageVerifier, Multibyte, SecureRandom, TimeWithZone] + [Dependencies, Deprecation, Gzip, MessageVerifier, Multibyte, SecureRandom, TimeWithZone] end autoload :BacktraceCleaner, 'active_support/backtrace_cleaner' |