diff options
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/metal/flash.rb | 6 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/metal/streaming.rb | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/actionpack/lib/action_controller/metal/flash.rb b/actionpack/lib/action_controller/metal/flash.rb index 47e71371e3..b078beb675 100644 --- a/actionpack/lib/action_controller/metal/flash.rb +++ b/actionpack/lib/action_controller/metal/flash.rb @@ -3,10 +3,10 @@ module ActionController #:nodoc: extend ActiveSupport::Concern included do - class_attribute :_flash_types, :instance_methods => false + class_attribute :_flash_types, instance_accessor: false self._flash_types = [] - delegate :flash, :to => :request + delegate :flash, to: :request add_flash_types(:alert, :notice) end @@ -14,7 +14,7 @@ module ActionController #:nodoc: def add_flash_types(*types) types.each do |type| next if _flash_types.include?(type) - + define_method(type) do request.flash[type] end diff --git a/actionpack/lib/action_controller/metal/streaming.rb b/actionpack/lib/action_controller/metal/streaming.rb index eeb37db2e7..9f3c997024 100644 --- a/actionpack/lib/action_controller/metal/streaming.rb +++ b/actionpack/lib/action_controller/metal/streaming.rb @@ -139,9 +139,6 @@ module ActionController #:nodoc: # session or flash after the template starts rendering will not propagate # to the client. # - # If you try to modify cookies, session or flash, an <tt>ActionDispatch::ClosedError</tt> - # will be raised, showing those objects are closed for modification. - # # == Middlewares # # Middlewares that need to manipulate the body won't work with streaming. |