Merge remote-tracking branch 'upstream/master' into feature/adapter

2026-01-25 07:16:49 +00:00 · 2014-08-29 12:55:20 +04:00
parent e45e5a82b7 f29e78f4c8
commit b4a313e6d8
5 changed files with 10 additions and 7 deletions
--- a/lib/active_model/serializer.rb
+++ b/lib/active_model/serializer.rb
@@ -68,8 +68,10 @@ module ActiveModel
      else
        serializer_name = "#{resource.class.name}Serializer"

-        if Object.const_defined?(serializer_name)
+        begin
          Object.const_get(serializer_name)
+        rescue NameError
+          nil
        end
      end
    end