diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-04-22 16:53:58 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-04-22 16:53:58 -0700 |
| commit | 7f6779c1d5e4ec7f642839caa7e86320720f77c8 (patch) | |
| tree | b6c7306a2a74efae0054445a2f41f5169a101422 /activerecord/lib | |
| parent | f5d720fb96f2e085acc4ed17f63272c4d38e567e (diff) | |
| parent | 6fee981fa4ea2654f825c58b58327fc15fddf3a6 (diff) | |
| download | rails-7f6779c1d5e4ec7f642839caa7e86320720f77c8.tar.gz rails-7f6779c1d5e4ec7f642839caa7e86320720f77c8.tar.bz2 rails-7f6779c1d5e4ec7f642839caa7e86320720f77c8.zip | |
Merge branch 'master' into cherry
Conflicts:
activesupport/lib/active_support.rb
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/serializers/json_serializer.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/serializers/json_serializer.rb b/activerecord/lib/active_record/serializers/json_serializer.rb index 1fd65ed006..c709c3f1eb 100644 --- a/activerecord/lib/active_record/serializers/json_serializer.rb +++ b/activerecord/lib/active_record/serializers/json_serializer.rb @@ -1,3 +1,5 @@ +require 'active_support/json' + module ActiveRecord #:nodoc: module Serialization def self.included(base) |