diff options
author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2022-12-26 14:00:11 +0900 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2022-12-26 15:09:21 +0900 |
commit | b7ad60a79440f65cf883d3ff9dbdde701666ef56 (patch) | |
tree | e0033b706a480377472bf93f58eaf42f6e2301ab /lib/bundler/dsl.rb | |
parent | 10c9ce9d4c632d7c6232b53367b0496aef2ebb13 (diff) |
Merge RubyGems/Bundler master
from https://github.com/rubygems/rubygems/commit/72fd3dd2096af16d797ad0cd8e0d2a8869e240b3
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/7025
Diffstat (limited to 'lib/bundler/dsl.rb')
-rw-r--r-- | lib/bundler/dsl.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bundler/dsl.rb b/lib/bundler/dsl.rb index 179fea4dfd..0492f52cfc 100644 --- a/lib/bundler/dsl.rb +++ b/lib/bundler/dsl.rb @@ -41,7 +41,7 @@ module Bundler end def eval_gemfile(gemfile, contents = nil) - expanded_gemfile_path = Pathname.new(gemfile).expand_path(@gemfile && @gemfile.parent) + expanded_gemfile_path = Pathname.new(gemfile).expand_path(@gemfile&.parent) original_gemfile = @gemfile @gemfile = expanded_gemfile_path @gemfiles << expanded_gemfile_path |