aboutsummaryrefslogtreecommitdiffstats
path: root/activeresource/lib/active_resource/base.rb
diff options
context:
space:
mode:
authorlest <just.lest@gmail.com>2011-11-30 18:44:37 +0300
committerlest <just.lest@gmail.com>2011-11-30 18:57:17 +0300
commit93387e2e7c66fb34bde5442ad314c9c63729b75b (patch)
treea6bbed6caddbcd2f84e43792e1ff0e4ac30d0a99 /activeresource/lib/active_resource/base.rb
parent565d92f57891c1114801a27cf45ba8ee4ec02cf9 (diff)
downloadrails-93387e2e7c66fb34bde5442ad314c9c63729b75b.tar.gz
rails-93387e2e7c66fb34bde5442ad314c9c63729b75b.tar.bz2
rails-93387e2e7c66fb34bde5442ad314c9c63729b75b.zip
fix deprecation warnings in activeresource
Diffstat (limited to 'activeresource/lib/active_resource/base.rb')
-rw-r--r--activeresource/lib/active_resource/base.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activeresource/lib/active_resource/base.rb b/activeresource/lib/active_resource/base.rb
index 10cc727bd9..93991ab6b3 100644
--- a/activeresource/lib/active_resource/base.rb
+++ b/activeresource/lib/active_resource/base.rb
@@ -1477,7 +1477,7 @@ module ActiveResource
extend ActiveModel::Naming
include CustomMethods, Observing, Validations
include ActiveModel::Conversion
- include ActiveModel::Serializers::JSON
- include ActiveModel::Serializers::Xml
+ include ActiveModel::Serializable::JSON
+ include ActiveModel::Serializable::XML
end
end