diff options
| author | Godfrey Chan <godfreykfc@gmail.com> | 2014-07-05 14:23:01 -0700 |
|---|---|---|
| committer | Godfrey Chan <godfreykfc@gmail.com> | 2014-07-05 14:34:13 -0700 |
| commit | a03097759bd7103bb9db253e7ba095f011453f75 (patch) | |
| tree | 4a20132e2c7fe66f25e7170ae751d3b67d92b3f5 /activerecord/lib/active_record.rb | |
| parent | acec038b38dc248c5c2f350de69ab89d9b1402c7 (diff) | |
| download | rails-a03097759bd7103bb9db253e7ba095f011453f75.tar.gz rails-a03097759bd7103bb9db253e7ba095f011453f75.tar.bz2 rails-a03097759bd7103bb9db253e7ba095f011453f75.zip | |
Merge pull request #16059 from jenncoop/json-serialized-attr
Fixed issue with ActiveRecord serialize object as JSON
Conflicts:
activerecord/CHANGELOG.md
activerecord/lib/active_record/attribute_methods/serialization.rb
Diffstat (limited to 'activerecord/lib/active_record.rb')
| -rw-r--r-- | activerecord/lib/active_record.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb index 17b00bbaea..9028970a3d 100644 --- a/activerecord/lib/active_record.rb +++ b/activerecord/lib/active_record.rb @@ -97,6 +97,7 @@ module ActiveRecord module Coders autoload :YAMLColumn, 'active_record/coders/yaml_column' + autoload :JSON, 'active_record/coders/json' end module AttributeMethods |