From ed149dbf46d1a8b16e6de9c3dbbcc10f72c9c019 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Thu, 15 Apr 2021 12:47:04 +0900
Subject: Merge the master branch of Bundler

---
 lib/bundler.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/bundler.rb')

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
 
-- 
cgit v1.2.3