aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/lib
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2019-06-13 09:37:49 -0700
committerGitHub <noreply@github.com>2019-06-13 09:37:49 -0700
commit3683a828dc69e871aa9d2e3ed189e1630935b5ad (patch)
tree74ef99e266229178266b9baa137d0579356d2dfa /actionview/lib
parent5a8714e559dd4d4058d23bd0d427a9d3e6022617 (diff)
parentc221b5b448569771678279216360460e066095a7 (diff)
downloadrails-3683a828dc69e871aa9d2e3ed189e1630935b5ad.tar.gz
rails-3683a828dc69e871aa9d2e3ed189e1630935b5ad.tar.bz2
rails-3683a828dc69e871aa9d2e3ed189e1630935b5ad.zip
Merge pull request #36388 from joelhawksley/actionview-component
Introduce ActionView::Component
Diffstat (limited to 'actionview/lib')
-rw-r--r--actionview/lib/action_view/helpers/rendering_helper.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/actionview/lib/action_view/helpers/rendering_helper.rb b/actionview/lib/action_view/helpers/rendering_helper.rb
index 7ead691113..4be23b68f3 100644
--- a/actionview/lib/action_view/helpers/rendering_helper.rb
+++ b/actionview/lib/action_view/helpers/rendering_helper.rb
@@ -35,7 +35,11 @@ module ActionView
end
end
else
- view_renderer.render_partial(self, partial: options, locals: locals, &block)
+ if options.respond_to?(:render_in)
+ options.render_in(self, &block)
+ else
+ view_renderer.render_partial(self, partial: options, locals: locals, &block)
+ end
end
end