diff options
| author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-06-17 16:23:11 -0700 |
|---|---|---|
| committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-06-17 16:23:11 -0700 |
| commit | 55ee0ba7f5b6b5d2023eb5dcc030946ed589fe53 (patch) | |
| tree | feb3f10381724dd41389b604d51dc42080098a60 /actionpack/lib/action_controller/base/streaming.rb | |
| parent | 8fdf3d7890d2e58508e028c93d3797f21a774dbc (diff) | |
| download | rails-55ee0ba7f5b6b5d2023eb5dcc030946ed589fe53.tar.gz rails-55ee0ba7f5b6b5d2023eb5dcc030946ed589fe53.tar.bz2 rails-55ee0ba7f5b6b5d2023eb5dcc030946ed589fe53.zip | |
Cleaning up if defined?(ActionController::Http) blocks from the pre new base era.
Diffstat (limited to 'actionpack/lib/action_controller/base/streaming.rb')
| -rw-r--r-- | actionpack/lib/action_controller/base/streaming.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/base/streaming.rb b/actionpack/lib/action_controller/base/streaming.rb index 5c72fc9ad9..70a97ccfec 100644 --- a/actionpack/lib/action_controller/base/streaming.rb +++ b/actionpack/lib/action_controller/base/streaming.rb @@ -4,10 +4,7 @@ module ActionController #:nodoc: module Streaming extend ActiveSupport::Concern - # TODO : Remove the defined? check when new base is the main base - if defined?(ActionController::Http) - include ActionController::Renderer - end + include ActionController::Renderer DEFAULT_SEND_FILE_OPTIONS = { :type => 'application/octet-stream'.freeze, |