aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-06-30 08:29:14 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-06-30 08:29:14 +0000
commit4cd5b05377c057ea44401dc759d641c5738540ce (patch)
treebf29f0c7078e98e489b192af018aeac3d08edb74 /actionpack/lib
parentbab674c681a1e28d44caeb6b7430273aaaaf4e71 (diff)
downloadrails-4cd5b05377c057ea44401dc759d641c5738540ce.tar.gz
rails-4cd5b05377c057ea44401dc759d641c5738540ce.tar.bz2
rails-4cd5b05377c057ea44401dc759d641c5738540ce.zip
Dont include the upload progress automatically before it works better
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1571 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
-rwxr-xr-xactionpack/lib/action_controller.rb2
1 files changed, 0 insertions, 2 deletions
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