aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators/rails/app/templates/config/boot.rb
diff options
context:
space:
mode:
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.rb4
1 files changed, 4 insertions, 0 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..0c7ae74b0a 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/boot.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/boot.rb
@@ -1,3 +1,6 @@
+<% if options[:skip_bundler] -%>
+require 'rubygems'
+<% else -%>
# Use Bundler (preferred)
begin
require File.expand_path('../../.bundle/environment', __FILE__)
@@ -6,3 +9,4 @@ rescue LoadError
require 'bundler'
Bundler.setup
end
+<% end -%>