mirror of
https://github.com/github/rails.git
synced 2026-04-26 03:00:59 -04:00
5b2eb64ceb
This reverts commit 8896b4fdc8.
Conflicts:
activemodel/lib/active_model.rb
activemodel/lib/active_model/serializable.rb
activemodel/lib/active_model/serializer.rb
activemodel/test/cases/serializer_test.rb
19 lines
481 B
Ruby
19 lines
481 B
Ruby
module ActiveRecord #:nodoc:
|
|
# = Active Record Serialization
|
|
module Serialization
|
|
extend ActiveSupport::Concern
|
|
include ActiveModel::Serializers::JSON
|
|
|
|
def serializable_hash(options = nil)
|
|
options = options.try(:clone) || {}
|
|
|
|
options[:except] = Array.wrap(options[:except]).map { |n| n.to_s }
|
|
options[:except] |= Array.wrap(self.class.inheritance_column)
|
|
|
|
super(options)
|
|
end
|
|
end
|
|
end
|
|
|
|
require 'active_record/serializers/xml_serializer'
|