diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-09 13:56:49 -0800 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-09 13:56:49 -0800 |
commit | 7a685542912d2cfbf1fd989f1cacdc8a05390b7d (patch) | |
tree | cce7a6d4de24b071fcef6f0d5c037164bf7a080d /actionpack | |
parent | d5fd09246edbaf2d73ee13dabf2b7b378203a530 (diff) | |
parent | a48f49e56bf53e0a2386da898576ef12d5258358 (diff) | |
download | rails-7a685542912d2cfbf1fd989f1cacdc8a05390b7d.tar.gz rails-7a685542912d2cfbf1fd989f1cacdc8a05390b7d.tar.bz2 rails-7a685542912d2cfbf1fd989f1cacdc8a05390b7d.zip |
Merge commit 'fxn/master'
Diffstat (limited to 'actionpack')
-rw-r--r-- | actionpack/lib/action_controller/metal/streaming.rb | 2 | ||||
-rwxr-xr-x | actionpack/lib/action_dispatch/http/request.rb | 1 | ||||
-rw-r--r-- | actionpack/test/controller/filters_test.rb | 1 |
3 files changed, 0 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/metal/streaming.rb b/actionpack/lib/action_controller/metal/streaming.rb index 4761763a26..43c661bef4 100644 --- a/actionpack/lib/action_controller/metal/streaming.rb +++ b/actionpack/lib/action_controller/metal/streaming.rb @@ -1,5 +1,3 @@ -require 'active_support/core_ext/string/bytesize' - module ActionController #:nodoc: # Methods for sending arbitrary data and for streaming files to the browser, # instead of rendering. diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb index c24b404e2f..b3bb8c623f 100755 --- a/actionpack/lib/action_dispatch/http/request.rb +++ b/actionpack/lib/action_dispatch/http/request.rb @@ -5,7 +5,6 @@ require 'strscan' require 'active_support/memoizable' require 'active_support/core_ext/array/wrap' require 'active_support/core_ext/hash/indifferent_access' -require 'active_support/core_ext/object/tap' require 'active_support/core_ext/string/access' module ActionDispatch diff --git a/actionpack/test/controller/filters_test.rb b/actionpack/test/controller/filters_test.rb index 2da97a9d86..8445428e8f 100644 --- a/actionpack/test/controller/filters_test.rb +++ b/actionpack/test/controller/filters_test.rb @@ -1,5 +1,4 @@ require 'abstract_unit' -require 'active_support/core_ext/symbol' class ActionController::Base class << self |