Merge pull request #35627 from Futurelearn/seb-rename-view-run-method

Rename `ActionView::Base#run`
rails · Mar 15, 2019 · 905018f · 905018f
2 parents 1cdc6c6 + 47fea39
commit 905018f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/actionview/lib/action_view/base.rb b/actionview/lib/action_view/base.rb
@@ -267,7 +267,7 @@ def initialize(lookup_context = nil, assigns = {}, controller = nil, formats = N
       _prepare_context
     end
 
-    def run(method, template, locals, buffer, &block)
+    def _run(method, template, locals, buffer, &block)
       _old_output_buffer, _old_virtual_path, _old_template = @output_buffer, @virtual_path, @current_template
       @current_template = template
       @output_buffer = buffer

diff --git a/actionview/lib/action_view/template.rb b/actionview/lib/action_view/template.rb
@@ -173,7 +173,7 @@ def supports_streaming?
     def render(view, locals, buffer = ActionView::OutputBuffer.new, &block)
       instrument_render_template do
         compile!(view)
-        view.run(method_name, self, locals, buffer, &block)
+        view._run(method_name, self, locals, buffer, &block)
       end
     rescue => e
       handle_render_error(view, e)

diff --git a/actionview/lib/action_view/template/handlers/erb/erubi.rb b/actionview/lib/action_view/template/handlers/erb/erubi.rb
@@ -27,7 +27,7 @@ def evaluate(action_view_erb_handler_context)
               include action_view_erb_handler_context._routes.url_helpers
               class_eval("define_method(:_template) { |local_assigns, output_buffer| #{src} }", @filename || "(erubi)", 0)
             }.empty
-            view.run(:_template, nil, {}, ActionView::OutputBuffer.new)
+            view._run(:_template, nil, {}, ActionView::OutputBuffer.new)
           end
 
         private