diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-05-01 11:40:46 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-05-01 11:40:46 +0000 |
| commit | 708a10d35bf7d34da574ca3f2ae6be4bfffd5267 (patch) | |
| tree | d2c623b0217bdd93ce8d3b9471b2235b36588bf2 /lib/rubygems.rb | |
| parent | abb8b330114e9079eca14b6f73e4c6109e4308b4 (diff) | |
Merge rubygems-2.6.12 from rubygems/rubygems.
* Details of changes:
https://github.com/rubygems/rubygems/blob/009080040279282d7b8ddd09acab41719cb4ba00/History.txt#L3
* I kept ko1's commmit related thread issue. It's not merged 2.6 branch on rubygems.
https://github.com/ruby/ruby/commit/1721dfa0ea963a85d4ac1e3415eb18ef427d4d36
* I removed test_realworld_default_gem from rubygems-2.6.12. It fails on
Ruby trunk. Because it's differences of test suite and environment.
https://github.com/rubygems/rubygems/pull/1899
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58530 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems.rb')
| -rw-r--r-- | lib/rubygems.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/rubygems.rb b/lib/rubygems.rb index 5cd1a4c47a..bc5bf9b4c2 100644 --- a/lib/rubygems.rb +++ b/lib/rubygems.rb @@ -10,7 +10,7 @@ require 'rbconfig' require 'thread' module Gem - VERSION = "2.6.11" + VERSION = "2.6.12" end # Must be first since it unloads the prelude from 1.9.2 @@ -234,6 +234,7 @@ module Gem def self.finish_resolve(request_set=Gem::RequestSet.new) request_set.import Gem::Specification.unresolved_deps.values + request_set.import Gem.loaded_specs.values.map {|s| Gem::Dependency.new(s.name, s.version) } request_set.resolve_current.each do |s| s.full_spec.activate |