From acd0612cdecccf7c759c9da55f575ffd08249dfe Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Sat, 7 Feb 2009 16:22:33 -0600 Subject: Don't add vendored rack to load path --- actionpack/lib/action_controller.rb | 3 +-- 1 file changed, 1 insertion(+), 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 -- cgit v1.2.3