From 1fdb98c033f49254394d16ea154c76596d70885b Mon Sep 17 00:00:00 2001 From: yui-knk Date: Tue, 29 Sep 2015 13:33:11 +0900 Subject: [ci skip] Fix explanation of `ActiveModel::Serialization` This explanation was change by https://github.com/rails/rails/commit/7a27de2b. This change reversed the including module (`ActiveModel::Serializers::JSON`) and the included module (`ActiveModel::Serialization`) by mistake. --- activemodel/lib/active_model/serialization.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'activemodel') diff --git a/activemodel/lib/active_model/serialization.rb b/activemodel/lib/active_model/serialization.rb index 341651d00d..70e10fa06d 100644 --- a/activemodel/lib/active_model/serialization.rb +++ b/activemodel/lib/active_model/serialization.rb @@ -31,9 +31,9 @@ module ActiveModel # of the attributes hash's keys. In order to override this behavior, take a look # at the private method +read_attribute_for_serialization+. # - # The JSON serialization is provided by default when you include the - # ActiveModel::Serialization module, so there is no need to explicitly - # include it. + # ActiveModel::Serializers::JSON module automatically includes + # the ActiveModel::Serialization module, so there is no need to + # explicitly include ActiveModel::Serialization. # # A minimal implementation including JSON would be: # -- cgit v1.2.3