Merge pull request rails#46298 from Shopify/actionview-jbuilder-compat

Fix Action View compatibility with jbuilder

Author: byroot

actionview/lib/action_view/renderer/abstract_renderer.rb

@@ -142,7 +142,7 @@ class RenderedTemplate # :nodoc:
       attr_reader :body, :template
 
       def initialize(body, template)
-        @body = body.to_s
+        @body = body
         @template = template
       end
 

actionview/lib/action_view/template.rb

@@ -180,7 +180,7 @@ def render(view, locals, buffer = nil, add_to_stack: true, &block)
           view._run(method_name, self, locals, buffer, add_to_stack: add_to_stack, has_strict_locals: @strict_locals, &block)
           nil
         else
-          view._run(method_name, self, locals, OutputBuffer.new, add_to_stack: add_to_stack, has_strict_locals: @strict_locals, &block).to_s
+          view._run(method_name, self, locals, OutputBuffer.new, add_to_stack: add_to_stack, has_strict_locals: @strict_locals, &block)&.to_s
         end
       end
     rescue => e