diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2021-12-24 09:32:59 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2021-12-24 10:35:31 +0900 |
| commit | b0ad6cb371747a04eb12580e74c73179173cc89d (patch) | |
| tree | ee873d5c682c4665c838e3ea43585536229a5509 /lib/bundler | |
| parent | de0523feddf740d28fe772f3a22ff9907f88bf69 (diff) | |
Merge RubyGems-3.3.2 and Bundler-2.3.2
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/5334
Diffstat (limited to 'lib/bundler')
| -rw-r--r-- | lib/bundler/definition.rb | 5 | ||||
| -rw-r--r-- | lib/bundler/version.rb | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb index 9a94bd3ed3..5cde1285a6 100644 --- a/lib/bundler/definition.rb +++ b/lib/bundler/definition.rb @@ -292,10 +292,7 @@ module Bundler locked_major = @locked_bundler_version.segments.first current_major = Gem::Version.create(Bundler::VERSION).segments.first - if updating_major = locked_major < current_major - Bundler.ui.warn "Warning: the lockfile is being updated to Bundler #{current_major}, " \ - "after which you will be unable to return to Bundler #{locked_major}." - end + updating_major = locked_major < current_major end preserve_unknown_sections ||= !updating_major && (Bundler.frozen_bundle? || !(unlocking? || @unlocking_bundler)) diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb index bfe7ae7f7c..a7ccc9c201 100644 --- a/lib/bundler/version.rb +++ b/lib/bundler/version.rb @@ -1,7 +1,7 @@ # frozen_string_literal: false module Bundler - VERSION = "2.3.1".freeze + VERSION = "2.3.2".freeze def self.bundler_major_version @bundler_major_version ||= VERSION.split(".").first.to_i |