aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
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 /actionpack
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 'actionpack')
-rw-r--r--actionpack/lib/action_dispatch/middleware/debug_view.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/debug_view.rb b/actionpack/lib/action_dispatch/middleware/debug_view.rb
index f16484d1ea..43c0a84504 100644
--- a/actionpack/lib/action_dispatch/middleware/debug_view.rb
+++ b/actionpack/lib/action_dispatch/middleware/debug_view.rb
@@ -11,8 +11,8 @@ module ActionDispatch
def initialize(assigns)
paths = [RESCUES_TEMPLATE_PATH]
- renderer = ActionView::Renderer.new ActionView::LookupContext.new(paths)
- super(renderer, assigns)
+ lookup_context = ActionView::LookupContext.new(paths)
+ super(lookup_context, assigns)
end
def compiled_method_container