Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Update rails to use the latest bundler

  • Loading branch information...
commit f497e7ad1d52fb795784cf6f5b2bc456e46dbd27 1 parent 7701587
Carl Lerche authored
View
2  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
View
2  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'
Please sign in to comment.
Something went wrong with that request. Please try again.