Merge branch 'master' into backport-from-ruby-core

Author: nobu

.github/workflows/cloudflare-preview.yml

@@ -92,6 +92,7 @@ jobs:
       - name: Comment on PR with preview URL
         uses: actions/github-script@v7
         with:
+          github-token: ${{ secrets.MATZBOT_GITHUB_TOKEN }}
           script: |
             const prNumber = ${{ env.PR_NUMBER }};
             const url = "${{ steps.deploy.outputs.deployment-url }}";

.github/workflows/push_gem.yml

@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
         with:
           egress-policy: audit
 
@@ -43,4 +43,4 @@ jobs:
           tag_name="$(git describe --tags --abbrev=0)"
           gh release create "${tag_name}" --verify-tag --generate-notes
         env:
-          GITHUB_TOKEN: ${{ secrets.MATZBOT_GITHUB_WORKFLOW_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

lib/rdoc/code_object/context/section.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require 'cgi/escape'
+require 'cgi/util' unless defined?(CGI::EscapeExt)
 
 ##
 # A section of documentation like:

lib/rdoc/code_object/method_attr.rb

@@ -283,6 +283,7 @@ def block_params=(value)
 
   def html_name
     require 'cgi/escape'
+    require 'cgi/util' unless defined?(CGI::EscapeExt)
 
     CGI.escape(@name.gsub('-', '-2D')).gsub('%', '-').sub(/^-/, '')
   end

lib/rdoc/markup/to_html.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 require 'cgi/escape'
-# For CGI.unescape on earlier rubies
-require 'cgi/util' if RUBY_VERSION < '3.5'
+require 'cgi/util' unless defined?(CGI::EscapeExt)
 
 ##
 # Outputs RDoc markup as HTML.

lib/rdoc/markup/to_label.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require 'cgi/escape'
+require 'cgi/util' unless defined?(CGI::EscapeExt)
 
 ##
 # Creates HTML-safe labels suitable for use in id attributes.  Tidylinks are

lib/rdoc/version.rb

@@ -5,6 +5,6 @@ module RDoc
   ##
   # RDoc version you are using
 
-  VERSION = '6.14.0'
+  VERSION = '6.14.1'
 
 end

rdoc.gemspec

@@ -51,9 +51,10 @@ RDoc includes the +rdoc+ and +ri+ tools for generating and displaying documentat
     "exe/rdoc",
     "exe/ri",
     "man/ri.1",
+    "rdoc.gemspec",
   ]
   template_files = Dir.glob("lib/rdoc/generator/template/**/*")
-  lib_files = Dir.glob("lib/**/*.{rb,kpeg,ry}")
+  lib_files = Dir.glob("lib/**/*.{rb,kpeg,ry}", base: File.expand_path('..', __FILE__))
 
   s.files = (non_lib_files + template_files + lib_files).uniq