diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2021-06-28 19:25:33 +0900 |
|---|---|---|
| committer | nagachika <nagachika@ruby-lang.org> | 2021-07-07 10:03:15 +0900 |
| commit | 865221f0ba69f07f700e06b2d2f0a859a01dd233 (patch) | |
| tree | 2bd6c79b1ada4af36c62a872e7e38d2f7129e7c1 /lib/bundler.rb | |
| parent | a50de0adfff8166ea18570edafafb0ba501ff2fa (diff) | |
Merge RubyGems-3.2.21 and Bundler-2.2.21
Diffstat (limited to 'lib/bundler.rb')
| -rw-r--r-- | lib/bundler.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bundler.rb b/lib/bundler.rb index b2363a25f4..8b9e870f7b 100644 --- a/lib/bundler.rb +++ b/lib/bundler.rb @@ -198,7 +198,7 @@ module Bundler def frozen_bundle? frozen = settings[:deployment] - frozen ||= settings[:frozen] unless feature_flag.deployment_means_frozen? + frozen ||= settings[:frozen] frozen end |