diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2012-05-25 15:58:16 +0100 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2012-06-15 19:15:36 +0100 |
| commit | e030f26ad3de98205edec9d8b59ecca9508cb57d (patch) | |
| tree | c57029efc255a81b6487803e02d2e38e0f0082b3 /activemodel/lib/active_model/serializers/json.rb | |
| parent | 61826bcca3481a85649be714a91a45ca909f2726 (diff) | |
| download | rails-e030f26ad3de98205edec9d8b59ecca9508cb57d.tar.gz rails-e030f26ad3de98205edec9d8b59ecca9508cb57d.tar.bz2 rails-e030f26ad3de98205edec9d8b59ecca9508cb57d.zip | |
Simplify AR configuration code.
Get rid of ActiveModel::Configuration, make better use of
ActiveSupport::Concern + class_attribute, etc.
Diffstat (limited to 'activemodel/lib/active_model/serializers/json.rb')
| -rw-r--r-- | activemodel/lib/active_model/serializers/json.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/activemodel/lib/active_model/serializers/json.rb b/activemodel/lib/active_model/serializers/json.rb index e668b4a009..b4baf3a946 100644 --- a/activemodel/lib/active_model/serializers/json.rb +++ b/activemodel/lib/active_model/serializers/json.rb @@ -10,9 +10,8 @@ module ActiveModel included do extend ActiveModel::Naming - extend ActiveModel::Configuration - config_attribute :include_root_in_json + class_attribute :include_root_in_json self.include_root_in_json = false end @@ -106,4 +105,4 @@ module ActiveModel end end end -end
\ No newline at end of file +end |