rename push / pop function

actionview/lib/action_view/base.rb

@@ -286,7 +286,7 @@ module ActionView #:nodoc:
       self.class
     end
 
-    def in_context(options, locals)
+    def in_rendering_context(options)
       old_view_renderer  = @view_renderer
       old_lookup_context = @lookup_context
 

actionview/lib/action_view/helpers/rendering_helper.rb

@@ -27,7 +27,7 @@ module ActionView
       def render(options = {}, locals = {}, &block)
         case options
         when Hash
-          in_context(options, locals) do |renderer|
+          in_rendering_context(options) do |renderer|
             if block_given?
               view_renderer.render_partial(self, options.merge(partial: options[:layout]), &block)
             else