X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c9fa49c99485b0ba1242c6d13e12df9ab1532987..965fb0b3ae7c89ae46d606147811674d646b6acb:/config/boot.rb

diff --git a/config/boot.rb b/config/boot.rb
index ab6cb374d..5e5f0c1fa 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,13 +1,4 @@
-require 'rubygems'
-
 # Set up gems listed in the Gemfile.
-gemfile = File.expand_path('../../Gemfile', __FILE__)
-begin
-  ENV['BUNDLE_GEMFILE'] = gemfile
-  require 'bundler'
-  Bundler.setup
-rescue Bundler::GemNotFound => e
-  STDERR.puts e.message
-  STDERR.puts "Try running `bundle install`."
-  exit!
-end if File.exist?(gemfile)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])