aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/test/models/contact.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2012-10-26 19:53:32 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2012-10-26 19:53:32 -0700
commit94f6b3dcfa454043307ba32045223eea0358de67 (patch)
treeb56eb43b83515e2d08fc5ad745f624a31436bc4a /activemodel/test/models/contact.rb
parentb79444053c6e000180c3b7787140bdb3cdafa183 (diff)
parent10d9cb2052610202b4f1b2db4b822aa5850b1da4 (diff)
downloadrails-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/test/models/contact.rb')
-rw-r--r--activemodel/test/models/contact.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/activemodel/test/models/contact.rb b/activemodel/test/models/contact.rb
index 7bfc542afb..191e2b8d43 100644
--- a/activemodel/test/models/contact.rb
+++ b/activemodel/test/models/contact.rb
@@ -1,5 +1,4 @@
class Contact
- extend ActiveModel::Naming
include ActiveModel::Conversion
attr_accessor :id, :name, :age, :created_at, :awesome, :preferences