summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2019-03-23 17:02:52 +0100
committerColby Swandale <me@colby.fyi>2019-04-04 22:45:31 +1100
commitf674ead086636f2a79e33e235b991445a2caba33 (patch)
treee8e31267677bdbb29b3f18221e8af3c1910438a6
parent0e11bce635045ba967f9223ccba5ea66725b8296 (diff)
downloadbundler-f674ead086636f2a79e33e235b991445a2caba33.tar.gz
Merge pull request #7061 from bundler/fix_circular_requires
Fix circular require warnings (cherry picked from commit aaa0b0ce6a447aa0f01301799f3163832da6566d)
-rw-r--r--lib/bundler/compatibility_guard.rb1
-rw-r--r--lib/bundler/rubygems_ext.rb1
-rw-r--r--lib/bundler/rubygems_integration.rb1
3 files changed, 0 insertions, 3 deletions
diff --git a/lib/bundler/compatibility_guard.rb b/lib/bundler/compatibility_guard.rb
index 750a1db04f..e2f8745b80 100644
--- a/lib/bundler/compatibility_guard.rb
+++ b/lib/bundler/compatibility_guard.rb
@@ -1,6 +1,5 @@
# frozen_string_literal: false
-require "rubygems"
require "bundler/version"
if Bundler::VERSION.split(".").first.to_i >= 2
diff --git a/lib/bundler/rubygems_ext.rb b/lib/bundler/rubygems_ext.rb
index e9f0eac355..faec14fec6 100644
--- a/lib/bundler/rubygems_ext.rb
+++ b/lib/bundler/rubygems_ext.rb
@@ -7,7 +7,6 @@ if defined?(Gem::QuickLoader)
Gem::QuickLoader.load_full_rubygems_library
end
-require "rubygems"
require "rubygems/specification"
begin
diff --git a/lib/bundler/rubygems_integration.rb b/lib/bundler/rubygems_integration.rb
index f088c2fdfb..a7d3368288 100644
--- a/lib/bundler/rubygems_integration.rb
+++ b/lib/bundler/rubygems_integration.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
require "monitor"
-require "rubygems"
require "rubygems/config_file"
module Bundler