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 the Bundler snippet for 0.9.15 and above

Browse source
This commit is contained in:
Andre Arko 2010-04-12 15:09:40 -07:00 committed by wycats
parent 86defed5ad
commit ca378659bc
2 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
rails.gemspec
View file

@ -14,7 +14,7 @@ Gem::Specification.new do |s|
s.email = 'david@loudthinking.com'
s.homepage = 'http://www.rubyonrails.org'
s.rubyforge_project = 'rails'
s.files = []
s.require_path = []
@ -24,5 +24,5 @@ Gem::Specification.new do |s|
s.add_dependency('activeresource', version)
s.add_dependency('actionmailer', version)
s.add_dependency('railties', version)
s.add_dependency('bundler', '>= 0.9.14')
s.add_dependency('bundler', '>= 0.9.19')
end

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

@ -1,14 +1,6 @@
# Use locked gems if present.
begin
require File.expand_path('../../.bundle/environment', __FILE__)
rescue LoadError
# Otherwise, use RubyGems.
require 'rubygems'
# And set up the gems listed in the Gemfile.
if File.exist?(File.expand_path('../../Gemfile', __FILE__))
require 'bundler'
Bundler.setup
end
require 'rubygems'
# Set up gems listed in the Gemfile.
if File.exist?(File.expand_path('../../Gemfile', __FILE__))
require 'bundler'
Bundler.setup
end