aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel
diff options
context:
space:
mode:
authorSean Griffin <sean@seantheprogrammer.com>2015-10-02 09:40:53 -0400
committerSean Griffin <sean@seantheprogrammer.com>2015-10-02 09:40:53 -0400
commit7e6d1f13b185201179545ba1ae4f4ec645f44d0b (patch)
tree04505642f554c798ea9f5f143ab1f830d6790a5a /activemodel
parent524cbc216748ee47dce10c79b7ca1f37172a8ead (diff)
parent1fdb98c033f49254394d16ea154c76596d70885b (diff)
downloadrails-7e6d1f13b185201179545ba1ae4f4ec645f44d0b.tar.gz
rails-7e6d1f13b185201179545ba1ae4f4ec645f44d0b.tar.bz2
rails-7e6d1f13b185201179545ba1ae4f4ec645f44d0b.zip
Merge pull request #21809 from yui-knk/fix_doc_am_serialization
[ci skip] Fix explanation of `ActiveModel::Serialization`
Diffstat (limited to 'activemodel')
-rw-r--r--activemodel/lib/active_model/serialization.rb6
1 files changed, 3 insertions, 3 deletions
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
- # <tt>ActiveModel::Serialization</tt> module, so there is no need to explicitly
- # include it.
+ # ActiveModel::Serializers::JSON module automatically includes
+ # the <tt>ActiveModel::Serialization</tt> module, so there is no need to
+ # explicitly include <tt>ActiveModel::Serialization</tt>.
#
# A minimal implementation including JSON would be:
#