diff options
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG | 3 | ||||
| -rwxr-xr-x | actionpack/lib/action_controller.rb | 2 |
2 files changed, 0 insertions, 5 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index fb52a84cfe..02b5073744 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -6,9 +6,6 @@ * Routes fail with leading slash #1540 [Nicholas Seckar] -* EXPERIMENTAL (problems on various different server setups): Added support for upload progress indicators in Apache and lighttpd 1.4.x (won't work in WEBrick or lighttpd 1.3.x) #1475 [Sean Treadway] - See http://sean.treadway.info/files/howto-upload-progress-2.mov for example. - * Added support for graceful error handling of Ajax calls #1217 [Jamis Buck/Thomas Fuchs]. Example: link_to_remote( diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb index 7cc0d605ae..deead18b5a 100755 --- a/actionpack/lib/action_controller.rb +++ b/actionpack/lib/action_controller.rb @@ -48,7 +48,6 @@ require 'action_controller/cgi_process' require 'action_controller/caching' require 'action_controller/components' require 'action_controller/verification' -require 'action_controller/upload_progress' require 'action_controller/streaming' require 'action_controller/auto_complete' @@ -70,7 +69,6 @@ ActionController::Base.class_eval do include ActionController::Caching include ActionController::Components include ActionController::Verification - include ActionController::UploadProgress include ActionController::Streaming include ActionController::AutoComplete end |