diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2012-10-26 19:53:32 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2012-10-26 19:53:32 -0700 |
| commit | 94f6b3dcfa454043307ba32045223eea0358de67 (patch) | |
| tree | b56eb43b83515e2d08fc5ad745f624a31436bc4a /activemodel/lib/active_model/serializers/json.rb | |
| parent | b79444053c6e000180c3b7787140bdb3cdafa183 (diff) | |
| parent | 10d9cb2052610202b4f1b2db4b822aa5850b1da4 (diff) | |
| download | rails-94f6b3dcfa454043307ba32045223eea0358de67.tar.gz rails-94f6b3dcfa454043307ba32045223eea0358de67.tar.bz2 rails-94f6b3dcfa454043307ba32045223eea0358de67.zip | |
Merge pull request #8038 from frodsan/fix_am_serializers_xml_dependency
Fix AM::Serializers::Xml dependency
Diffstat (limited to 'activemodel/lib/active_model/serializers/json.rb')
| -rw-r--r-- | activemodel/lib/active_model/serializers/json.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/serializers/json.rb b/activemodel/lib/active_model/serializers/json.rb index a4252b995d..9d984b7a18 100644 --- a/activemodel/lib/active_model/serializers/json.rb +++ b/activemodel/lib/active_model/serializers/json.rb @@ -1,8 +1,8 @@ require 'active_support/json' module ActiveModel - # == Active Model JSON Serializer module Serializers + # == Active Model JSON Serializer module JSON extend ActiveSupport::Concern include ActiveModel::Serialization |