aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib/active_model/serializers
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-07-20 23:28:58 -0500
committerJoshua Peek <josh@joshpeek.com>2009-07-20 23:28:58 -0500
commit2685d93b0728b647b6f49f3e1802c779d5fb9867 (patch)
treea13ca815c54f66749edce249fd7421d7b14108a8 /activemodel/lib/active_model/serializers
parente7a2496fda92ff4e39c127b065bf51ed6301e772 (diff)
downloadrails-2685d93b0728b647b6f49f3e1802c779d5fb9867.tar.gz
rails-2685d93b0728b647b6f49f3e1802c779d5fb9867.tar.bz2
rails-2685d93b0728b647b6f49f3e1802c779d5fb9867.zip
Kill AMo ivar attributes helper
Diffstat (limited to 'activemodel/lib/active_model/serializers')
-rw-r--r--activemodel/lib/active_model/serializers/json.rb1
-rw-r--r--activemodel/lib/active_model/serializers/xml.rb1
2 files changed, 0 insertions, 2 deletions
diff --git a/activemodel/lib/active_model/serializers/json.rb b/activemodel/lib/active_model/serializers/json.rb
index adf200597d..e94512fd64 100644
--- a/activemodel/lib/active_model/serializers/json.rb
+++ b/activemodel/lib/active_model/serializers/json.rb
@@ -5,7 +5,6 @@ module ActiveModel
module Serializers
module JSON
extend ActiveSupport::Concern
- include ActiveModel::Attributes
included do
extend ActiveModel::Naming
diff --git a/activemodel/lib/active_model/serializers/xml.rb b/activemodel/lib/active_model/serializers/xml.rb
index 7cdd281223..76a0e54a56 100644
--- a/activemodel/lib/active_model/serializers/xml.rb
+++ b/activemodel/lib/active_model/serializers/xml.rb
@@ -5,7 +5,6 @@ module ActiveModel
module Serializers
module Xml
extend ActiveSupport::Concern
- include ActiveModel::Attributes
class Serializer < ActiveModel::Serializer #:nodoc:
class Attribute #:nodoc: