Don't add vendored rack to load path

acd0612c · Joshua Peek · 524d8edf · acd0612c
隐藏空白更改
内联并排

Showing with 1 addition and 2 deletion

actionpack/lib/action_controller.rb actionpack/lib/action_controller.rb +1 -2

未找到文件。
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -31,8 +31,7 @@
  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