diff options
| -rw-r--r-- | actionpack/lib/action_controller.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/base.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/metal/data_streaming.rb (renamed from actionpack/lib/action_controller/metal/streaming.rb) | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb index 62cc18b253..26e6ac770f 100644 --- a/actionpack/lib/action_controller.rb +++ b/actionpack/lib/action_controller.rb @@ -13,6 +13,7 @@ module ActionController autoload :Compatibility autoload :ConditionalGet autoload :Cookies + autoload :DataStreaming autoload :Flash autoload :ForceSSL autoload :Head @@ -30,7 +31,6 @@ module ActionController autoload :Rescue autoload :Responder autoload :SessionManagement - autoload :Streaming autoload :Testing autoload :UrlFor end diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 5f9e082cd3..53e0a4b9d1 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -199,7 +199,7 @@ module ActionController Flash, RequestForgeryProtection, ForceSSL, - Streaming, + DataStreaming, RecordIdentifier, HttpAuthentication::Basic::ControllerMethods, HttpAuthentication::Digest::ControllerMethods, diff --git a/actionpack/lib/action_controller/metal/streaming.rb b/actionpack/lib/action_controller/metal/data_streaming.rb index 312dc8eb3e..997bc6e958 100644 --- a/actionpack/lib/action_controller/metal/streaming.rb +++ b/actionpack/lib/action_controller/metal/data_streaming.rb @@ -3,7 +3,7 @@ require 'active_support/core_ext/file/path' module ActionController #:nodoc: # Methods for sending arbitrary data and for streaming files to the browser, # instead of rendering. - module Streaming + module DataStreaming extend ActiveSupport::Concern include ActionController::Rendering |