Remove Upload Progress. Closes #2871.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3406 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
rails · Jan 13, 2006 · 489ace6 · 489ace6
1 parent f4f7e75
commit 489ace6
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 1,671 deletions.
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Remove Upload Progress. #2871 [Sean Treadway]
+
 * Fix typo in function name mapping in auto_complete_field. #2929 #3446 [doppler@gmail.com phil.ross@gmail.com]
 
 *  Allow auto-discovery of third party template library layouts. [Marcel Molina Jr.]

diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
@@ -348,12 +348,6 @@ def uses_component_template_root
         path_of_controller_root    = path_of_calling_controller.sub(/#{controller_path.split("/")[0..-2]}$/, "") # " (for ruby-mode)
         self.template_root = path_of_controller_root
       end
-
-      # Temporary method for enabling upload progress until it's ready to leave experimental mode
-      def enable_upload_progress # :nodoc:
-        require 'action_controller/upload_progress'
-        include ActionController::UploadProgress
-      end
     end
 
     public

diff --git a/actionpack/lib/action_controller/cgi_ext/multipart_progress.rb b/actionpack/lib/action_controller/cgi_ext/multipart_progress.rb