aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-11-22 22:40:32 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2008-11-22 22:40:32 -0800
commit4d2ccbb364b62275bad142d9a0b66ee7fd0c424a (patch)
tree29918f323e029ca5b5ffa3e61edd999a7dae06a4 /actionpack
parent6b06c9870aef6c44b99ae07ae8ddcbc4bfb13221 (diff)
downloadrails-4d2ccbb364b62275bad142d9a0b66ee7fd0c424a.tar.gz
rails-4d2ccbb364b62275bad142d9a0b66ee7fd0c424a.tar.bz2
rails-4d2ccbb364b62275bad142d9a0b66ee7fd0c424a.zip
Use a relative require for bundled rack lib
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_controller/vendor/rack.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/vendor/rack.rb b/actionpack/lib/action_controller/vendor/rack.rb
index 2ab7575b05..2438059f76 100644
--- a/actionpack/lib/action_controller/vendor/rack.rb
+++ b/actionpack/lib/action_controller/vendor/rack.rb
@@ -4,5 +4,6 @@ begin
gem 'rack', '~> 0.4.0'
require 'rack'
rescue Gem::LoadError
- require "#{File.dirname(__FILE__)}/rack-0.4.0/rack"
+ $LOAD_PATH << "#{File.dirname(__FILE__)}/rack-0.4.0"
+ require 'rack'
end