kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Update rails to use the latest bundler

Browse source
This commit is contained in:
Carl Lerche 2010-02-03 16:56:32 -08:00
parent 77015872be
commit f497e7ad1d
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rails.gemspec
View file

@ -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

2
railties/lib/generators/rails/app/templates/config/boot.rb
View file

@ -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'