diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-08-24 15:28:23 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-08-24 15:28:23 +0000 |
commit | 996b1bfa95347e5171c3f7ab32b6740656ed7a8b (patch) | |
tree | be0310be446bf313f16a12a3a3b56c30b4900cbd /lib/rubygems/resolver/molinillo/lib/molinillo/resolver.rb | |
parent | ce8729feb61d507805d965c5479f343e3701c659 (diff) |
merge revision(s) 53707,53708,53709,53712,53777,53781: [Backport #12326]
* lib/rubygems.rb, lib/rubygems/*, test/rubygems/*: Update rubygems-2.5.2.
It supports to enable frozen string literal and add `--norc` option for
disable to `.gemrc` configuration.
See 2.5.2 release notes for other fixes and enhancements.
https://github.com/rubygems/rubygems/blob/a8aa3bac723f045c52471c7b9328310a048561e0/History.txt#L3
* lib/rubygems/specification.rb: `coding` is affect only first line except
shebang.
* lib/rubygems/package.rb, lib/rubygems/package/*: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@56003 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/resolver/molinillo/lib/molinillo/resolver.rb')
-rw-r--r-- | lib/rubygems/resolver/molinillo/lib/molinillo/resolver.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/rubygems/resolver/molinillo/lib/molinillo/resolver.rb b/lib/rubygems/resolver/molinillo/lib/molinillo/resolver.rb index a92b3273ab..5c59a45c3d 100644 --- a/lib/rubygems/resolver/molinillo/lib/molinillo/resolver.rb +++ b/lib/rubygems/resolver/molinillo/lib/molinillo/resolver.rb @@ -1,10 +1,10 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rubygems/resolver/molinillo/lib/molinillo/dependency_graph' module Gem::Resolver::Molinillo # This class encapsulates a dependency resolver. # The resolver is responsible for determining which set of dependencies to - # activate, with feedback from the the {#specification_provider} + # activate, with feedback from the {#specification_provider} # # class Resolver @@ -18,6 +18,7 @@ module Gem::Resolver::Molinillo # during the resolution process attr_reader :resolver_ui + # Initializes a new resolver. # @param [SpecificationProvider] specification_provider # see {#specification_provider} # @param [UI] resolver_ui |