diff options
Diffstat (limited to 'lib/bundler.rb')
-rw-r--r-- | lib/bundler.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/bundler.rb b/lib/bundler.rb index 69370e81a7..f83268e9cd 100644 --- a/lib/bundler.rb +++ b/lib/bundler.rb @@ -210,9 +210,10 @@ module Bundler end def frozen_bundle? - frozen = settings[:deployment] - frozen ||= settings[:frozen] - frozen + frozen = settings[:frozen] + return frozen unless frozen.nil? + + settings[:deployment] end def locked_gems |