archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-15 08:33:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge rubygems/bundler HEAD.

Browse source 
Pick from dfbb5a3811
This commit is contained in:
Hiroshi SHIBATA 2022-08-09 11:16:07 +09:00
parent f8936b3341
commit 44264b4fee
Notes: git 2022-08-09 12:05:48 +09:00
80 changed files with 312 additions and 286 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/rubygems/core_ext/kernel_warn.rb
View file

@ -39,7 +39,7 @@ if RUBY_VERSION >= "2.5" && !Gem::KERNEL_WARN_IGNORES_INTERNAL_ENTRIES
start += 1
if path = loc.path
unless path.start_with?(rubygems_path) or path.start_with?("<internal:")
unless path.start_with?(rubygems_path) || path.start_with?("<internal:")
# Non-rubygems frames
uplevel -= 1
end