diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2021-04-15 12:47:04 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2021-04-15 15:36:15 +0900 |
| commit | ed149dbf46d1a8b16e6de9c3dbbcc10f72c9c019 (patch) | |
| tree | 1c8c755fa592e280dc7718dc8a9317d1ac368394 /lib/bundler.rb | |
| parent | 0d9496f924d36534bd524791554d49dc0026b0e0 (diff) | |
Merge the master branch of Bundler
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/4383
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 d370d8a53a..9f7f9b218f 100644 --- a/lib/bundler.rb +++ b/lib/bundler.rb @@ -197,7 +197,7 @@ module Bundler def frozen_bundle? frozen = settings[:deployment] - frozen ||= settings[:frozen] unless feature_flag.deployment_means_frozen? + frozen ||= settings[:frozen] frozen end |