aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-06-17 13:05:14 -0700
committerYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-06-17 13:05:14 -0700
commit7ac9f29093c8f4d9739008a52d7d3265cfb04e23 (patch)
treeee1357e410da49c712b064055f8a20939a6e2b80
parent6927f1119b65852807f146da3d0a6354cdede02f (diff)
downloadrails-7ac9f29093c8f4d9739008a52d7d3265cfb04e23.tar.gz
rails-7ac9f29093c8f4d9739008a52d7d3265cfb04e23.tar.bz2
rails-7ac9f29093c8f4d9739008a52d7d3265cfb04e23.zip
Updated require for AMo move
-rw-r--r--activerecord/lib/active_record/serializers/json_serializer.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/serializers/json_serializer.rb b/activerecord/lib/active_record/serializers/json_serializer.rb
index e49cf59494..21afcd6e5c 100644
--- a/activerecord/lib/active_record/serializers/json_serializer.rb
+++ b/activerecord/lib/active_record/serializers/json_serializer.rb
@@ -1,5 +1,5 @@
require 'active_support/json'
-require 'active_support/core_ext/module/model_naming'
+require 'active_model/naming'
module ActiveRecord #:nodoc:
module Serialization