From f7e33620caffecb7f065c5e4f5a19597f8c35cdd Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Fri, 17 Dec 2010 16:06:38 +0100
Subject: [PATCH] Allow to use BUNDLE_GEMFILE env variable in boot.rb [#6184
 state:resolved]

---
 .../lib/rails/generators/rails/app/templates/config/boot.rb     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 ab6cb374de..f7b36a13da 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/boot.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/boot.rb
@@ -3,7 +3,7 @@
 # Set up gems listed in the Gemfile.
 gemfile = File.expand_path('../../Gemfile', __FILE__)
 begin
-  ENV['BUNDLE_GEMFILE'] = gemfile
+  ENV['BUNDLE_GEMFILE'] ||= gemfile
   require 'bundler'
   Bundler.setup
 rescue Bundler::GemNotFound => e
-- 
GitLab