diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-12-26 01:28:12 -0800 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-12-26 01:28:12 -0800 |
| commit | 63e14a7969834f9cc716b9c996aad381b57c0882 (patch) | |
| tree | a209fccd9385f8948c85eba98ff7b3b3b73da80c /actionpack | |
| parent | b417d3d43be911190ee3e8e746da68698779959d (diff) | |
| parent | a7ba8e1fb325a20dc5115eeef278ce946d0450c7 (diff) | |
| download | rails-63e14a7969834f9cc716b9c996aad381b57c0882.tar.gz rails-63e14a7969834f9cc716b9c996aad381b57c0882.tar.bz2 rails-63e14a7969834f9cc716b9c996aad381b57c0882.zip | |
Merge pull request #4118 from nashby/remove-file-to-path
remove File#to_path alias
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/metal/data_streaming.rb | 3 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/metal/streaming.rb | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/metal/data_streaming.rb b/actionpack/lib/action_controller/metal/data_streaming.rb index 0670a58d97..30ddf6c16e 100644 --- a/actionpack/lib/action_controller/metal/data_streaming.rb +++ b/actionpack/lib/action_controller/metal/data_streaming.rb @@ -1,4 +1,3 @@ -require 'active_support/core_ext/file/path' require 'action_controller/metal/exceptions' module ActionController #:nodoc: @@ -115,7 +114,7 @@ module ActionController #:nodoc: private def send_file_headers!(options) type_provided = options.has_key?(:type) - + options.update(DEFAULT_SEND_FILE_OPTIONS.merge(options)) [:type, :disposition].each do |arg| raise ArgumentError, ":#{arg} option required" if options[arg].nil? diff --git a/actionpack/lib/action_controller/metal/streaming.rb b/actionpack/lib/action_controller/metal/streaming.rb index 5fe5334458..0e46402962 100644 --- a/actionpack/lib/action_controller/metal/streaming.rb +++ b/actionpack/lib/action_controller/metal/streaming.rb @@ -1,4 +1,3 @@ -require 'active_support/core_ext/file/path' require 'rack/chunked' module ActionController #:nodoc: @@ -195,7 +194,7 @@ module ActionController #:nodoc: # ==== Passenger # # To be described. - # + # module Streaming extend ActiveSupport::Concern |