aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/test
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2011-11-05 17:21:58 +0000
committerJon Leighton <j@jonathanleighton.com>2011-11-05 17:21:58 +0000
commitf140445b1d2c4bf30bf5b0f28b9461773757b933 (patch)
tree9d3d1a9a04a2ae1eaf8a85c78a670a583184f10d /activemodel/test
parent55621504b0d527393d2de86d15b5f40752825fde (diff)
downloadrails-f140445b1d2c4bf30bf5b0f28b9461773757b933.tar.gz
rails-f140445b1d2c4bf30bf5b0f28b9461773757b933.tar.bz2
rails-f140445b1d2c4bf30bf5b0f28b9461773757b933.zip
Revert "Merge pull request #2378 from cesario/remove_warnings_activemodel"
This reverts commit 6aaae3de277b572f37e09f16ae12737c3c87dfb7, reversing changes made to fdbc4e5f4e5746ebf558485348c841b33f038fda. Reason: build failure.
Diffstat (limited to 'activemodel/test')
-rw-r--r--activemodel/test/cases/serializers/xml_serialization_test.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/activemodel/test/cases/serializers/xml_serialization_test.rb b/activemodel/test/cases/serializers/xml_serialization_test.rb
index facbd73261..fc73d9dcd8 100644
--- a/activemodel/test/cases/serializers/xml_serialization_test.rb
+++ b/activemodel/test/cases/serializers/xml_serialization_test.rb
@@ -9,7 +9,6 @@ class Contact
attr_accessor :address, :friends
- remove_method :attributes
def attributes
instance_values.except("address", "friends")
end