aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib/action_controller.rb')
-rw-r--r--actionpack/lib/action_controller.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index 5f76dbaabb..1a3e05cc86 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -31,8 +31,7 @@ rescue LoadError
end
end
-$:.unshift "#{File.dirname(__FILE__)}/action_controller/vendor/rack-1.0"
-require 'rack'
+require 'action_controller/vendor/rack-1.0/rack'
module ActionController
# TODO: Review explicit to see if they will automatically be handled by