diff options
Diffstat (limited to 'railties/lib/rails/generators/rails/app/templates/config/boot.rb')
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/boot.rb | 16 |
1 files changed, 9 insertions, 7 deletions
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 0c7ae74b0a..809fef02c1 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/boot.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/boot.rb @@ -1,12 +1,14 @@ -<% if options[:skip_bundler] -%> -require 'rubygems' -<% else -%> -# Use Bundler (preferred) +# Use locked gems if present. begin require File.expand_path('../../.bundle/environment', __FILE__) + rescue LoadError + # Otherwise, use RubyGems. require 'rubygems' - require 'bundler' - Bundler.setup + + # And set up the gems listed in the Gemfile. + if File.exist?(File.expand_path('../../Gemfile')) + require 'bundler' + Bundler.setup + end end -<% end -%> |