summaryrefslogtreecommitdiff
path: root/lib/rubygems/resolver/set.rb
diff options
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-03-17 01:29:22 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-03-17 01:29:22 +0000
commitfa59a2ea808e6b7af862462c764a2110f1ff7ab2 (patch)
tree6ce8d14bd2fd646ca55c80f9676688b2616b4dd1 /lib/rubygems/resolver/set.rb
parent9eb94b4dc1e6cb21c80b2dfa930bc522a85414ec (diff)
Merge rubygems-2.6.11
This version fixed regression of rubygems-2.6.10. https://github.com/rubygems/rubygems/pull/1856 See details of changelogs for 2.6.11 release: https://github.com/rubygems/rubygems/blob/adfcf40502716080bd9cdfdd2e43bd4296872784/History.txt#L3 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57998 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/resolver/set.rb')
-rw-r--r--lib/rubygems/resolver/set.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/rubygems/resolver/set.rb b/lib/rubygems/resolver/set.rb
index cc12633d46..11704d5c4c 100644
--- a/lib/rubygems/resolver/set.rb
+++ b/lib/rubygems/resolver/set.rb
@@ -21,6 +21,7 @@ class Gem::Resolver::Set
attr_accessor :prerelease
def initialize # :nodoc:
+ require 'uri'
@prerelease = false
@remote = true
@errors = []
@@ -54,4 +55,3 @@ class Gem::Resolver::Set
end
end
-