aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Sarnacki <drogus@gmail.com>2010-12-17 16:06:38 +0100
committerPiotr Sarnacki <drogus@gmail.com>2010-12-17 16:10:08 +0100
commitf7e33620caffecb7f065c5e4f5a19597f8c35cdd (patch)
tree45442d1d9c69c93a1b02c2d3193561bf829dfdcd
parent006ec77e60163d57d655479602230672d98e0f10 (diff)
downloadrails-f7e33620caffecb7f065c5e4f5a19597f8c35cdd.tar.gz
rails-f7e33620caffecb7f065c5e4f5a19597f8c35cdd.tar.bz2
rails-f7e33620caffecb7f065c5e4f5a19597f8c35cdd.zip
Allow to use BUNDLE_GEMFILE env variable in boot.rb [#6184 state:resolved]
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/boot.rb2
1 files changed, 1 insertions, 1 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 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 @@ require 'rubygems'
# 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