Merge bb33cf3 into 39b2a2b

rails-api · Dec 3, 2013 · dcff025 · dcff025
2 parents 39b2a2b + bb33cf3
commit dcff025
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/active_model/serializer/generators/serializer/serializer_generator.rb b/lib/active_model/serializer/generators/serializer/serializer_generator.rb
@@ -26,7 +26,7 @@ def parent_class_name
         if options[:parent]
           options[:parent]
         elsif (ns = Rails::Generators.namespace) && ns.const_defined?(:ApplicationSerializer) ||
-               defined?(::ApplicationSerializer)
+               (Object.const_get(:ApplicationSerializer) rescue nil)
           'ApplicationSerializer'
         else
           'ActiveModel::Serializer'