summaryrefslogtreecommitdiff
path: root/lib/bundler/settings.rb
diff options
context:
space:
mode:
authorHiroshi SHIBATA <hsbt@ruby-lang.org>2021-12-25 06:27:56 +0900
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2021-12-25 07:40:52 +0900
commitda6a5e3ed16ab0cdda7546dd9caf55c59be7b86f (patch)
treebd6f624e694dc6b96ce429c1100d3ab240001c19 /lib/bundler/settings.rb
parent2b2115318b4ee236ef61a3450bf85b16e591006d (diff)
Merge RubyGems-3.3.3 and Bundler-2.3.3
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/5342
Diffstat (limited to 'lib/bundler/settings.rb')
-rw-r--r--lib/bundler/settings.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/bundler/settings.rb b/lib/bundler/settings.rb
index 1ced590b6f..72728fb20f 100644
--- a/lib/bundler/settings.rb
+++ b/lib/bundler/settings.rb
@@ -219,6 +219,7 @@ module Bundler
def path
configs.each do |_level, settings|
path = value_for("path", settings)
+ path = "vendor/bundle" if value_for("deployment", settings) && path.nil?
path_system = value_for("path.system", settings)
disabled_shared_gems = value_for("disable_shared_gems", settings)
next if path.nil? && path_system.nil? && disabled_shared_gems.nil?