aboutsummaryrefslogtreecommitdiffstats
path: root/load_paths.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2010-02-04 09:42:28 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2010-02-04 10:08:06 -0800
commit2faf94a7af7326517b45a2c9cff5ee476092e138 (patch)
tree7015f10c1a3a2369f919b67cf6a359d04f1bc046 /load_paths.rb
parent23ad1eff0dab4079b7bc68f71df537fc85582d05 (diff)
downloadrails-2faf94a7af7326517b45a2c9cff5ee476092e138.tar.gz
rails-2faf94a7af7326517b45a2c9cff5ee476092e138.tar.bz2
rails-2faf94a7af7326517b45a2c9cff5ee476092e138.zip
Use the correct environment.rb path
Diffstat (limited to 'load_paths.rb')
-rw-r--r--load_paths.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/load_paths.rb b/load_paths.rb
index 55e2a530bd..d5f2ca0734 100644
--- a/load_paths.rb
+++ b/load_paths.rb
@@ -1,5 +1,5 @@
begin
- require File.expand_path('../vendor/environment', __FILE__)
+ require File.expand_path('../.bundle/environment', __FILE__)
rescue LoadError
begin
require 'rubygems'
@@ -18,4 +18,4 @@ rescue LoadError
$:.unshift File.expand_path("../#{framework}/lib", __FILE__)
end
end
-end \ No newline at end of file
+end