From f497e7ad1d52fb795784cf6f5b2bc456e46dbd27 Mon Sep 17 00:00:00 2001 From: Carl Lerche Date: Wed, 3 Feb 2010 16:56:32 -0800 Subject: Update rails to use the latest bundler --- rails.gemspec | 2 +- railties/lib/generators/rails/app/templates/config/boot.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rails.gemspec b/rails.gemspec index b44dc27cb0..acdb1d00fc 100644 --- a/rails.gemspec +++ b/rails.gemspec @@ -14,7 +14,7 @@ Gem::Specification.new do |s| s.add_dependency('activeresource', '= 3.0.pre') s.add_dependency('actionmailer', '= 3.0.pre') s.add_dependency('railties', '= 3.0.pre') - s.add_dependency('bundler', '>= 0.9.0.pre') + s.add_dependency('bundler', '>= 0.9.0.pre5') s.rdoc_options << '--exclude' << '.' s.has_rdoc = false 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' -- cgit v1.2.3