diff options
| author | José Valim <jose.valim@gmail.com> | 2011-11-30 18:38:28 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-11-30 18:48:17 +0100 |
| commit | 5b2eb64ceb08cd005dc06b721935de5853971473 (patch) | |
| tree | 6af4ba143b6948c6c97d7fb0937397a425a2e17c /activerecord/lib/active_record/serialization.rb | |
| parent | be99f0c7eb4734011b9ee435bb5ac4a0b916a065 (diff) | |
| download | rails-5b2eb64ceb08cd005dc06b721935de5853971473.tar.gz rails-5b2eb64ceb08cd005dc06b721935de5853971473.tar.bz2 rails-5b2eb64ceb08cd005dc06b721935de5853971473.zip | |
Revert "Implement ArraySerializer and move old serialization API to a new namespace."
This reverts commit 8896b4fdc8a543157cdf4dfc378607ebf6c10ab0.
Conflicts:
activemodel/lib/active_model.rb
activemodel/lib/active_model/serializable.rb
activemodel/lib/active_model/serializer.rb
activemodel/test/cases/serializer_test.rb
Diffstat (limited to 'activerecord/lib/active_record/serialization.rb')
| -rw-r--r-- | activerecord/lib/active_record/serialization.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/serialization.rb b/activerecord/lib/active_record/serialization.rb index c23514c465..5ad40d8cd9 100644 --- a/activerecord/lib/active_record/serialization.rb +++ b/activerecord/lib/active_record/serialization.rb @@ -2,7 +2,7 @@ module ActiveRecord #:nodoc: # = Active Record Serialization module Serialization extend ActiveSupport::Concern - include ActiveModel::Serializable::JSON + include ActiveModel::Serializers::JSON def serializable_hash(options = nil) options = options.try(:clone) || {} |