Merge remote branch 'rails/master'

1 files changed, 6 insertions, 1 deletions

diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index a7ba9f374a..956c88a553 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -3,6 +3,7 @@ require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/class/attribute'
 require 'active_support/core_ext/array/wrap'
 require 'active_support/ordered_options'
+require 'action_view/log_subscriber'
 
 module ActionView #:nodoc:
   class NonConcattingString < ActiveSupport::SafeBuffer
@@ -204,8 +205,12 @@ module ActionView #:nodoc:
         value.dup : ActionView::PathSet.new(Array.wrap(value))
     end
 
+    def assign(new_assigns) # :nodoc:
+      self.assigns = new_assigns.each { |key, value| instance_variable_set("@#{key}", value) }
+    end
+
     def initialize(lookup_context = nil, assigns_for_first_render = {}, controller = nil, formats = nil) #:nodoc:
-      self.assigns = assigns_for_first_render.each { |key, value| instance_variable_set("@#{key}", value) }
+      assign(assigns_for_first_render)
       self.helpers = self.class.helpers || Module.new
 
       if @_controller = controller