aboutsummaryrefslogtreecommitdiffstats
path: root/lib/rubygems.rb
diff options
context:
space:
mode:
authorKazuhiro NISHIYAMA <zn@mbf.nifty.com>2019-06-06 16:49:40 +0900
committerKazuhiro NISHIYAMA <zn@mbf.nifty.com>2019-06-06 16:49:40 +0900
commitfcc36d767b60329692b27d685ba867848da6aa04 (patch)
tree9d74bbf4d43c7b3e29066ae53a60aa86c0c6c0bb /lib/rubygems.rb
parentc2a9c350249588677cf68b506539093504927eac (diff)
downloadruby-fcc36d767b60329692b27d685ba867848da6aa04.tar.gz
Revert "Stop `circular require` warning"
This reverts commit c2a9c350249588677cf68b506539093504927eac. It cannot stop `circular require` warning.
Diffstat (limited to 'lib/rubygems.rb')
-rw-r--r--lib/rubygems.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/rubygems.rb b/lib/rubygems.rb
index 33502f6946..3508a1f3aa 100644
--- a/lib/rubygems.rb
+++ b/lib/rubygems.rb
@@ -1207,7 +1207,7 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
ENV["BUNDLE_GEMFILE"] ||= File.expand_path(path)
require 'rubygems/user_interaction'
Gem::DefaultUserInteraction.use_ui(ui) do
- require "bundler" unless caller_locations.any? { |location| location.path.end_with?("bundler.rb") }
+ require "bundler"
begin
@gemdeps = Bundler.setup
ensure