diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-07-07 20:44:49 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-07-07 20:44:49 +0530 |
| commit | ee20be7c33538e6e9d334ddbd16d427190c7ff00 (patch) | |
| tree | e6551251983948768cf4a315822f6d8b50fd00dd /actionpack | |
| parent | 5fde4d47938661b77d8b58bec63d64b66c33ced9 (diff) | |
| parent | 700e5ffea261de09c6e12b5077597320ba1ffbd1 (diff) | |
| download | rails-ee20be7c33538e6e9d334ddbd16d427190c7ff00.tar.gz rails-ee20be7c33538e6e9d334ddbd16d427190c7ff00.tar.bz2 rails-ee20be7c33538e6e9d334ddbd16d427190c7ff00.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/metal/streaming.rb | 3 | ||||
| -rw-r--r-- | actionpack/lib/action_view/helpers/asset_tag_helper.rb | 2 |
2 files changed, 1 insertions, 4 deletions
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. diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb index 02c1250c76..68b0195700 100644 --- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb +++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb @@ -95,7 +95,7 @@ module ActionView # have SSL certificates for each of the asset hosts this technique allows you # to avoid warnings in the client about mixed media. # - # ActionController::Base.asset_host = Proc.new { |source, request| + # config.action_controller.asset_host = Proc.new { |source, request| # if request.ssl? # "#{request.protocol}#{request.host_with_port}" # else |