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

[rails.git] / config / boot.rb

diff --git a/config/boot.rb b/config/boot.rb
index 6b750f00b1dff4d94937b97ae0dbf76784b02164..282011619d92227924de59017a1eda9c5b555047 100644 (file)
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,3 +1,3 @@
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)

 
 

-require 'bundler/setup' # Set up gems listed in the Gemfile.
+require "bundler/setup" # Set up gems listed in the Gemfile.