diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-01-04 03:24:39 +0530 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-01-04 03:24:39 +0530 |
| commit | cda36a0731f14b33a920bf7e32255661e06f890a (patch) | |
| tree | 79ccba37953f9fe3055503be42b1610faa6d64ad /actionpack/lib/action_controller/metal/streaming.rb | |
| parent | bd4a3cce4ecd8e648179a91e26506e3622ac2162 (diff) | |
| parent | a115b5d79a850bb56cd3c9db9a05d6da35e3d7be (diff) | |
| download | rails-cda36a0731f14b33a920bf7e32255661e06f890a.tar.gz rails-cda36a0731f14b33a920bf7e32255661e06f890a.tar.bz2 rails-cda36a0731f14b33a920bf7e32255661e06f890a.zip | |
Merge remote branch 'mainstream/master'
Diffstat (limited to 'actionpack/lib/action_controller/metal/streaming.rb')
| -rw-r--r-- | actionpack/lib/action_controller/metal/streaming.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/streaming.rb b/actionpack/lib/action_controller/metal/streaming.rb index 43c661bef4..288b5d7c99 100644 --- a/actionpack/lib/action_controller/metal/streaming.rb +++ b/actionpack/lib/action_controller/metal/streaming.rb @@ -4,7 +4,7 @@ module ActionController #:nodoc: module Streaming extend ActiveSupport::Concern - include ActionController::RenderingController + include ActionController::Rendering DEFAULT_SEND_FILE_OPTIONS = { :type => 'application/octet-stream'.freeze, |