Merge remote-tracking branch 'openstreetmap/pull/1352'

[rails.git] / config / boot.rb

diff --git a/config/boot.rb b/config/boot.rb
index ab6cb374de20fe94b208a1f092cce79a7ef6108e..fb24cf2ed5f1f9b011aa3d6fa54876afc52de145 100644 (file)
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,13 +1,3 @@
-require 'rubygems'
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__)
 
-# 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)
+require "bundler/setup" # Set up gems listed in the Gemfile.