From 85d461456c154d7b4a72b20369e0d65d7880ce02 Mon Sep 17 00:00:00 2001 From: hsbt Date: Mon, 27 Aug 2018 10:05:04 +0000 Subject: Merge master branch from rubygems upstream. * It's preparation to release RubyGems 3.0.0.beta2 and Ruby 2.6.0 preview 3. * https://github.com/rubygems/rubygems/compare/v3.0.0.beta1...fad2eb15a282b19dfcb4b48bc95b8b39ebb4511f git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64555 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/rubygems/basic_specification.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/rubygems/basic_specification.rb') diff --git a/lib/rubygems/basic_specification.rb b/lib/rubygems/basic_specification.rb index 72954a7863..54242983ff 100644 --- a/lib/rubygems/basic_specification.rb +++ b/lib/rubygems/basic_specification.rb @@ -152,7 +152,7 @@ class Gem::BasicSpecification # The path to the data directory for this gem. def datadir -# TODO: drop the extra ", gem_name" which is uselessly redundant + # TODO: drop the extra ", gem_name" which is uselessly redundant File.expand_path(File.join(gems_dir, full_name, "data", name)).untaint end @@ -282,7 +282,7 @@ class Gem::BasicSpecification self.raw_require_paths.first end else - "lib" # default value for require_paths for bundler/inline + "lib" # default value for require_paths for bundler/inline end "#{self.full_gem_path}/#{dirs}".dup.untaint -- cgit v1.2.3