## mark a section (Learn more)

diff --git a/railties/lib/rails/generators/rails/app/templates/config/boot.rb b/railties/lib/rails/generators/rails/app/templates/config/boot.rb index 44c8846..2c523a6 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/boot.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/boot.rb @@ -7,10 +7,12 @@ vendor_rails = File.expand_path('../../vendor/rails', __FILE__) if File.exist?(environment) # Use Bundler (preferred) require environment -elsif File.exist?(vendor_rails) - # Use 2.x style vendor/rails directory - Dir["#{vendor_rails}/*/lib"].each { |path| $:.unshift(path) } else + if File.exist?(vendor_rails) + # Use 2.x style vendor/rails directory + Dir["#{vendor_rails}/*/lib"].each { |path| $:.unshift(path) } + end + # Load Rails from traditional RubyGems require 'rubygems' end

This paste will be private.