aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/lib/action_view/renderer/partial_renderer.rb
diff options
context:
space:
mode:
authorAaron Patterson <tenderlove@github.com>2019-02-13 08:27:05 -0800
committerGitHub <noreply@github.com>2019-02-13 08:27:05 -0800
commitf22c6bbfe5f9bc308216c0e15a4986ae228d6ccf (patch)
treedda321ba9d1cbbec6b1396b09016f04544f0c790 /actionview/lib/action_view/renderer/partial_renderer.rb
parentbe099cc13f6d0240782d7d63bedd4814ad48fb2d (diff)
parent2b6d2d20374130da469ece24842ce3b681d3b788 (diff)
downloadrails-f22c6bbfe5f9bc308216c0e15a4986ae228d6ccf.tar.gz
rails-f22c6bbfe5f9bc308216c0e15a4986ae228d6ccf.tar.bz2
rails-f22c6bbfe5f9bc308216c0e15a4986ae228d6ccf.zip
Merge pull request #35229 from rails/fix-35222
Convert lookup context's to a stack for fixing #35222 and #34138
Diffstat (limited to 'actionview/lib/action_view/renderer/partial_renderer.rb')
-rw-r--r--actionview/lib/action_view/renderer/partial_renderer.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/actionview/lib/action_view/renderer/partial_renderer.rb b/actionview/lib/action_view/renderer/partial_renderer.rb
index 801916954f..800a62eaa1 100644
--- a/actionview/lib/action_view/renderer/partial_renderer.rb
+++ b/actionview/lib/action_view/renderer/partial_renderer.rb
@@ -379,8 +379,6 @@ module ActionView
@locals = options[:locals] || {}
@details = extract_details(options)
- prepend_formats(options[:formats])
-
partial = options[:partial]
if String === partial