Skip to content

[pull] master from ruby:master #752

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Feb 6, 2026
Merged

[pull] master from ruby:master #752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26b81be
Extend timeout for ci.rvm.jp
hsbt Feb 6, 2026
08652f8
Added instruction to use 'gem "cgi"' or Bundler
hsbt Feb 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/cgi.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,7 @@
require "cgi/escape"
warn <<-WARNING, uplevel: Gem::BUNDLED_GEMS.uplevel if $VERBOSE
CGI library is removed from Ruby 4.0. Please use cgi/escape instead for CGI.escape and CGI.unescape features.
If you need to use the full features of CGI library, Please install cgi gem.
If you need to use the full features of CGI library, please add 'gem "cgi"' to your script
or use Bundler to ensure you are using the cgi gem instead of this file.
WARNING
2 changes: 1 addition & 1 deletion test/ruby/test_thread_queue.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ def test_thr_kill

bug5343 = '[ruby-core:39634]'
Dir.mktmpdir {|d|
timeout = 60
timeout = 120
total_count = 250
begin
assert_normal_exit(<<-"_eom", bug5343, timeout: timeout, chdir: d)
Expand Down