1 files changed, 9 insertions, 3 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 3cb561d41f..3971a07012 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/boot.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/boot.rb
@@ -1,8 +1,14 @@
-# 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', __FILE__))
+    require 'bundler'
+    Bundler.setup
+  end
 end