aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack')
-rwxr-xr-xactionpack/lib/action_controller/base.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 91ebc7e69d..c9b0973561 100755
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -325,6 +325,12 @@ module ActionController #:nodoc:
path_of_controller_root = path_of_calling_controller.sub(/#{controller_path.split("/")[0..-2]}$/, "")
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