Get rid of the sidebar's onclose global state

[rails.git] / config / boot.rb

diff --git a/config/boot.rb b/config/boot.rb
index ab6cb374de20fe94b208a1f092cce79a7ef6108e..4489e58688ca642d8e0e9489f6896f49f9b89da6 100644 (file)
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,13 +1,6 @@
 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.exists?(ENV['BUNDLE_GEMFILE'])