aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/generators/rails
diff options
context:
space:
mode:
authorCarl Lerche <carllerche@mac.com>2010-02-03 16:56:32 -0800
committerCarl Lerche <carllerche@mac.com>2010-02-03 16:56:32 -0800
commitf497e7ad1d52fb795784cf6f5b2bc456e46dbd27 (patch)
tree9f5b077da076c550f055978bdae6294ff3d8c195 /railties/lib/generators/rails
parent77015872be219be8e8121d69ea173cab3a9ce9a0 (diff)
downloadrails-f497e7ad1d52fb795784cf6f5b2bc456e46dbd27.tar.gz
rails-f497e7ad1d52fb795784cf6f5b2bc456e46dbd27.tar.bz2
rails-f497e7ad1d52fb795784cf6f5b2bc456e46dbd27.zip
Update rails to use the latest bundler
Diffstat (limited to 'railties/lib/generators/rails')
-rw-r--r--railties/lib/generators/rails/app/templates/config/boot.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/generators/rails/app/templates/config/boot.rb b/railties/lib/generators/rails/app/templates/config/boot.rb
index 70bd40bc4c..7407d6143a 100644
--- a/railties/lib/generators/rails/app/templates/config/boot.rb
+++ b/railties/lib/generators/rails/app/templates/config/boot.rb
@@ -1,6 +1,6 @@
# Use Bundler (preferred)
begin
- require File.expand_path('../../vendor/environment', __FILE__)
+ require File.expand_path('../../.bundle/environment', __FILE__)
rescue LoadError
require 'rubygems'
require 'bundler'