diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-02-07 16:22:33 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-02-07 16:22:33 -0600 |
| commit | acd0612cdecccf7c759c9da55f575ffd08249dfe (patch) | |
| tree | 9f1951c5d2fddaead3ab3c5918778ba64756a7f6 | |
| parent | 524d8edf68ab94315a128cbd7570d1cf4faf7d7a (diff) | |
| download | rails-acd0612cdecccf7c759c9da55f575ffd08249dfe.tar.gz rails-acd0612cdecccf7c759c9da55f575ffd08249dfe.tar.bz2 rails-acd0612cdecccf7c759c9da55f575ffd08249dfe.zip | |
Don't add vendored rack to load path
| -rw-r--r-- | actionpack/lib/action_controller.rb | 3 |
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 |