Merge remote-tracking branch 'upstream/pull/2381'

[rails.git] / config / boot.rb

diff --git a/config/boot.rb b/config/boot.rb
index 4489e58688ca642d8e0e9489f6896f49f9b89da6..988a5ddc460f03c2cafb3b91d98f0cc930ebc8ed 100644 (file)
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,6 +1,4 @@
-require 'rubygems'
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)

 
 

-# Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+require "bundler/setup" # Set up gems listed in the Gemfile.
+require "bootsnap/setup" # Speed up boot time by caching expensive operations.