aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-06-28 17:42:51 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-06-28 17:42:51 +0000
commit62ed6950c9119c12e6b17a68c79c45c77a7b1ca4 (patch)
treec00beda4e2f4ea5e88f39882dc421cb8b7e68a0d /actionpack/lib/action_controller.rb
parent96e590ca3c25e63d03c9ae5d74a40538cbe88f58 (diff)
downloadrails-62ed6950c9119c12e6b17a68c79c45c77a7b1ca4.tar.gz
rails-62ed6950c9119c12e6b17a68c79c45c77a7b1ca4.tar.bz2
rails-62ed6950c9119c12e6b17a68c79c45c77a7b1ca4.zip
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]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1552 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller.rb')
-rwxr-xr-xactionpack/lib/action_controller.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index deead18b5a..7cc0d605ae 100755
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -48,6 +48,7 @@ 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'
@@ -69,6 +70,7 @@ ActionController::Base.class_eval do
include ActionController::Caching
include ActionController::Components
include ActionController::Verification
+ include ActionController::UploadProgress
include ActionController::Streaming
include ActionController::AutoComplete
end