From bbe56a643734025aef6a3cbeb07c5306505040f6 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Mon, 12 Dec 2022 09:09:23 +0900 Subject: Merge RubyGems/Bundler master from https://github.com/rubygems/rubygems/commit/bfb0ae69776069155d2092702bfbb5a12617d85a --- libexec/bundle | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'libexec') diff --git a/libexec/bundle b/libexec/bundle index 73a6397e77..77b77d8ef8 100755 --- a/libexec/bundle +++ b/libexec/bundle @@ -15,10 +15,7 @@ else require "bundler" end -# Workaround for non-activated bundler spec due to missing https://github.com/rubygems/rubygems/commit/4e306d7bcdee924b8d80ca9db6125aa59ee4e5a3 -gem "bundler", Bundler::VERSION if Gem.rubygems_version < Gem::Version.new("2.6.2") - -if Gem.rubygems_version < Gem::Version.new("3.2.3") && Gem.ruby_version < Gem::Version.new("2.6.a") && !ENV["BUNDLER_NO_OLD_RUBYGEMS_WARNING"] +if Gem.rubygems_version < Gem::Version.new("3.2.3") && Gem.ruby_version < Gem::Version.new("3.0.a") && !ENV["BUNDLER_NO_OLD_RUBYGEMS_WARNING"] Bundler.ui.warn \ "Your RubyGems version (#{Gem::VERSION}) has a bug that prevents " \ "`required_ruby_version` from working for Bundler. Any scripts that use " \ -- cgit v1.2.1