Skip to content
  • nagachika's avatar
    2a70d214
    merge revision(s)... · 2a70d214
    nagachika authored
    merge revision(s) b1c73f23,bb570ce6,b88d1e6b,127f735c,f3f1a666,fa048a0f,d5d1c417,52ebaf71,7fe22152,19e6d271,05898c5b,3651f678,10b08206,de8e6218,971a0cd2,61a29a41,ff9a0088,fad3412d,54aa11ef,e84d275f,61e1cf23,a6948329,64b991b0,b1c73f23,0ee24b4f: [Backport #17877]
    
    Synchronize rdoc with upstream version v6.3.1.
    
    	[ruby/rdoc] Use File.open to fix the OS Command Injection
    	 vulnerability in CVE-2021-31799
    
    	https://github.com/ruby/rdoc/commit/a7f5d6ab88
    	---
    	 lib/rdoc/rdoc.rb            |  2 +-
    	 test/rdoc/test_rdoc_rdoc.rb | 12 ++++++++++++
    	 2 files changed, 13 insertions(+), 1 deletion(-)
    
    	[ruby/rdoc] Support ChangeLog generated by `git log`
    
    	https://github.com/ruby/rdoc/commit/5e0a123ca1
    	---
    	 lib/rdoc/parser/changelog.rb            | 35 +++++++++++++++++++++
    	 test/rdoc/test_rdoc_parser_changelog.rb | 56 +++++++++++++++++++++++++++++++++
    	 2 files changed, 91 insertions(+)
    
    	[ruby/rdoc] Make each commit entries h3
    
    	https://github.com/ruby/rdoc/commit/11eefb2ae9
    	---
    	 lib/rdoc/parser/changelog.rb            | 12 ++++++------
    	 test/rdoc/test_rdoc_parser_changelog.rb | 12 ++++--------
    	 2 files changed, 10 insertions(+), 14 deletions(-)
    
    	[ruby/rdoc] Tweak log entry markdown
    
    	* add 3 levels to headings
    	* prefix commit log to labels to make unique IDs
    
    	https://github.com/ruby/rdoc/commit/5074c13209
    	---
    	 lib/rdoc/parser/changelog.rb            | 20 +++++++++++++++++-
    	 test/rdoc/test_rdoc_parser_changelog.rb | 36 ++++++++++++++++++++++++++++++++-
    	 2 files changed, 54 insertions(+), 2 deletions(-)
    
    	[ruby/rdoc] Shorten commit hashes
    
    	https://github.com/ruby/rdoc/commit/5d3e153963
    	---
    	 lib/rdoc/parser/changelog.rb            | 2 +-
    	 test/rdoc/test_rdoc_parser_changelog.rb | 2 +-
    	 2 files changed, 2 insertions(+), 2 deletions(-)
    
    	[ruby/rdoc] Add links to the commits
    
    	https://github.com/ruby/rdoc/commit/1821628076
    	---
    	 lib/rdoc/parser/changelog.rb            | 107 +++++++++++++++++++++++++-------
    	 test/rdoc/test_rdoc_parser_changelog.rb |  36 ++++++-----
    	 2 files changed, 107 insertions(+), 36 deletions(-)
    
    	[ruby/rdoc] Sort by CommitDate if available
    
    	https://github.com/ruby/rdoc/commit/455715e930
    	---
    	 lib/rdoc/parser/changelog.rb            | 11 ++++++---
    	 test/rdoc/test_rdoc_parser_changelog.rb | 40 +++++++++++++++++++++++++++++++++
    	 2 files changed, 48 insertions(+), 3 deletions(-)
    
    	[ruby/rdoc] Skip non-date logs by git-log
    
    	`RDoc::Parser::ChangeLog` mis-parses ChangeLog generated by
    	git-log, because of too heuristic `Time.parse`.
    
    	For instance, "commit 8187228d"
    	results in "8187-08-16", that is, day 228 in the year 8187.
    
    	https://github.com/ruby/rdoc/commit/9711e6f6d9
    	---
    	 lib/rdoc/parser/changelog.rb            | 36 ++++++++++++++++++++-------------
    	 test/rdoc/test_rdoc_parser_changelog.rb |  2 ++
    	 2 files changed, 24 insertions(+), 14 deletions(-)
    
    	[ruby/rdoc] Support other date formats in git-log
    
    	https://github.com/ruby/rdoc/commit/ad8cf37d72
    	---
    	 lib/rdoc/parser/changelog.rb            |  6 +++---
    	 test/rdoc/test_rdoc_parser_changelog.rb | 22 ++++++++++++++++++++++
    	 2 files changed, 25 insertions(+), 3 deletions(-)
    
    	[ruby/rdoc] Support iso-strict format in git-log
    
    	https://github.com/ruby/rdoc/commit/2a6c22da63
    	---
    	 lib/rdoc/parser/changelog.rb            |  6 +++---
    	 test/rdoc/test_rdoc_parser_changelog.rb | 11 +++++++++++
    	 2 files changed, 14 insertions(+), 3 deletions(-)
    
    	[ruby/rdoc] Update Rdoc.css sidebar panel.
    
    	Updates css so the sidebar look like a panel instead of looking like chopped edges.
    
    	https://github.com/ruby/rdoc/commit/b0098c6d72
    	---
    	 lib/rdoc/generator/template/darkfish/css/rdoc.css | 1 +
    	 1 file changed, 1 insertion(+)
    
    	[ruby/rdoc] Support GFM table
    
    	https://github.com/ruby/rdoc/commit/9dc933df16
    	---
    	 lib/rdoc/markdown.rb                    | 349 +++++++++++++++++++++++++++++++-
    	 lib/rdoc/markup.rb                      |   1 +
    	 lib/rdoc/markup/table.rb                |  47 +++++
    	 lib/rdoc/markup/to_html.rb              |  23 +++
    	 lib/rdoc/markup/to_joined_paragraph.rb  |   1 +
    	 lib/rdoc/markup/to_rdoc.rb              |  28 +++
    	 lib/rdoc/markup/to_table_of_contents.rb |   1 +
    	 test/rdoc/test_rdoc_markdown.rb         |  23 +++
    	 8 files changed, 471 insertions(+), 2 deletions(-)
    	 create mode 100644 lib/rdoc/markup/table.rb
    
    	[ruby/rdoc] Add table style
    
    	https://github.com/ruby/rdoc/commit/2219c5ae80
    	---
    	 lib/rdoc/generator/template/darkfish/css/rdoc.css | 19 +++++++++++++++++++
    	 1 file changed, 19 insertions(+)
    
    	[ruby/rdoc] Fixed CodeFence without blank lines
    
    	Currently a fenced code block needs a preceding blank line, it
    	should not be required, as:
    	https://github.github.com/gfm/#fenced-code-blocks
    	> A fenced code block may interrupt a paragraph, and does not
    	> require a blank line either before or after.
    
    	Just recommended:
    	https://docs.github.com/en/github/writing-on-github/creating-and-highlighting-code-blocks
    	> We recommend placing a blank line before and after code blocks
    	> to make the raw formatting easier to read.
    
    	https://github.com/ruby/rdoc/commit/0e1776caf3
    	---
    	 lib/rdoc/markdown.rb            | 447 +++++++---------------------------------
    	 test/rdoc/test_rdoc_markdown.rb |  36 +++-
    	 2 files changed, 112 insertions(+), 371 deletions(-)
    
    	[ruby/rdoc] Allow partial default values to be overridden with
    	 .rdoc_options
    
    	https://github.com/ruby/rdoc/commit/e14800891f
    	---
    	 lib/rdoc/options.rb         | 34 +++++++++++++++++++++++++++++++++-
    	 lib/rdoc/rdoc.rb            |  7 ++++++-
    	 test/rdoc/test_rdoc_rdoc.rb | 12 ++++++++++++
    	 3 files changed, 51 insertions(+), 2 deletions(-)
    
    	[ruby/rdoc] Allow empty .rdoc_options
    
    	https://github.com/ruby/rdoc/commit/0c8cb25b50
    	---
    	 lib/rdoc/rdoc.rb            |  2 ++
    	 test/rdoc/test_rdoc_rdoc.rb | 11 +++++++++++
    	 2 files changed, 13 insertions(+)
    
    	[ruby/rdoc] Suppress unused variable warning of "text"
    
    	https://github.com/ruby/rdoc/commit/3a4120b155
    	---
    	 lib/rdoc/markdown.rb | 345 ++++++++++++++++++++++++++++++++++++++++++++++++++-
    	 1 file changed, 343 insertions(+), 2 deletions(-)
    
    	[ruby/rdoc] Get rid of a trailing space
    
    	https://github.com/ruby/rdoc/commit/7b7b91768e
    	---
    	 lib/rdoc/markdown.rb | 7 +++----
    	 1 file changed, 3 insertions(+), 4 deletions(-)
    
    	[ruby/rdoc] Disable other notations in <code> tags
    
    	https://github.com/ruby/rdoc/commit/0cd3b55210
    	---
    	 lib/rdoc/markup/attr_span.rb                    |  10 ++-
    	 lib/rdoc/markup/attribute_manager.rb            | 102 ++++++++++++++++++------
    	 test/rdoc/test_rdoc_markup_attribute_manager.rb |  24 +++++-
    	 test/rdoc/test_rdoc_markup_to_html.rb           |   6 ++
    	 4 files changed, 114 insertions(+), 28 deletions(-)
    
    	[ruby/rdoc] Treat other tags as word boundaries
    
    	https://github.com/ruby/rdoc/commit/8222f85a17
    	---
    	 lib/rdoc/markup/attribute_manager.rb  | 17 +++++++++++++----
    	 test/rdoc/test_rdoc_markup_to_html.rb |  5 +++++
    	 2 files changed, 18 insertions(+), 4 deletions(-)
    
    	[ruby/rdoc] Treat emphasis tags as excluding other notations
    
    	And exclusive notations don't exclude other exclusive notations.
    
    	https://github.com/ruby/rdoc/commit/b8baa9a435
    	---
    	 lib/rdoc/markup/attr_span.rb                    |  2 +-
    	 lib/rdoc/markup/attribute_manager.rb            | 10 +++++-----
    	 test/rdoc/test_rdoc_markup_attribute_manager.rb |  1 +
    	 3 files changed, 7 insertions(+), 6 deletions(-)
    
    	[ruby/rdoc] Clarify that dots in URL are replaced
    
    	The dots in all path components from the document root are
    	replaced with underscores, not only in the basename.
    
    	https://github.com/ruby/rdoc/commit/7a3417ea4c
    	---
    	 test/rdoc/test_rdoc_top_level.rb | 3 +++
    	 1 file changed, 3 insertions(+)
    
    	[ruby/rdoc] Links to document texts without "rdoc-ref:" prefix
    
    	While links to generated HTML from RDoc file needs to be prefixed
    	by "rdoc-ref:" currently, in case of explicit references this
    	seems just redundant.
    
    	Also GitHub RDoc support does not work with this prefix.
    
    	This patch lets links to such document texts (".rb", ".rdoc" and
    	".md" now) refer URLs generated by `RDoc::TopLevel#http_url`
    	without the prefix.
    
    	https://github.com/ruby/rdoc/commit/f18b27b69d
    	---
    	 lib/rdoc/markup/to_html.rb            |  4 ++++
    	 test/rdoc/test_rdoc_markup_to_html.rb | 21 +++++++++++++++++++++
    	 2 files changed, 25 insertions(+)
    
    	[ruby/rdoc] Use File.open to fix the OS Command Injection
    	 vulnerability in CVE-2021-31799
    
    	https://github.com/ruby/rdoc/commit/a7f5d6ab88
    	---
    	 lib/rdoc/rdoc.rb            |  2 +-
    	 test/rdoc/test_rdoc_rdoc.rb | 12 ++++++++++++
    	 2 files changed, 13 insertions(+), 1 deletion(-)
    
    	[ruby/rdoc] Version 6.3.1
    
    	https://github.com/ruby/rdoc/commit/9307f932b7
    	---
    	 lib/rdoc/version.rb | 2 +-
    	 1 file changed, 1 insertion(+), 1 deletion(-)
    2a70d214
    merge revision(s)...
    nagachika authored
    merge revision(s) b1c73f23,bb570ce6,b88d1e6b,127f735c,f3f1a666,fa048a0f,d5d1c417,52ebaf71,7fe22152,19e6d271,05898c5b,3651f678,10b08206,de8e6218,971a0cd2,61a29a41,ff9a0088,fad3412d,54aa11ef,e84d275f,61e1cf23,a6948329,64b991b0,b1c73f23,0ee24b4f: [Backport #17877]
    
    Synchronize rdoc with upstream version v6.3.1.
    
    	[ruby/rdoc] Use File.open to fix the OS Command Injection
    	 vulnerability in CVE-2021-31799
    
    	https://github.com/ruby/rdoc/commit/a7f5d6ab88
    	---
    	 lib/rdoc/rdoc.rb            |  2 +-
    	 test/rdoc/test_rdoc_rdoc.rb | 12 ++++++++++++
    	 2 files changed, 13 insertions(+), 1 deletion(-)
    
    	[ruby/rdoc] Support ChangeLog generated by `git log`
    
    	https://github.com/ruby/rdoc/commit/5e0a123ca1
    	---
    	 lib/rdoc/parser/changelog.rb            | 35 +++++++++++++++++++++
    	 test/rdoc/test_rdoc_parser_changelog.rb | 56 +++++++++++++++++++++++++++++++++
    	 2 files changed, 91 insertions(+)
    
    	[ruby/rdoc] Make each commit entries h3
    
    	https://github.com/ruby/rdoc/commit/11eefb2ae9
    	---
    	 lib/rdoc/parser/changelog.rb            | 12 ++++++------
    	 test/rdoc/test_rdoc_parser_changelog.rb | 12 ++++--------
    	 2 files changed, 10 insertions(+), 14 deletions(-)
    
    	[ruby/rdoc] Tweak log entry markdown
    
    	* add 3 levels to headings
    	* prefix commit log to labels to make unique IDs
    
    	https://github.com/ruby/rdoc/commit/5074c13209
    	---
    	 lib/rdoc/parser/changelog.rb            | 20 +++++++++++++++++-
    	 test/rdoc/test_rdoc_parser_changelog.rb | 36 ++++++++++++++++++++++++++++++++-
    	 2 files changed, 54 insertions(+), 2 deletions(-)
    
    	[ruby/rdoc] Shorten commit hashes
    
    	https://github.com/ruby/rdoc/commit/5d3e153963
    	---
    	 lib/rdoc/parser/changelog.rb            | 2 +-
    	 test/rdoc/test_rdoc_parser_changelog.rb | 2 +-
    	 2 files changed, 2 insertions(+), 2 deletions(-)
    
    	[ruby/rdoc] Add links to the commits
    
    	https://github.com/ruby/rdoc/commit/1821628076
    	---
    	 lib/rdoc/parser/changelog.rb            | 107 +++++++++++++++++++++++++-------
    	 test/rdoc/test_rdoc_parser_changelog.rb |  36 ++++++-----
    	 2 files changed, 107 insertions(+), 36 deletions(-)
    
    	[ruby/rdoc] Sort by CommitDate if available
    
    	https://github.com/ruby/rdoc/commit/455715e930
    	---
    	 lib/rdoc/parser/changelog.rb            | 11 ++++++---
    	 test/rdoc/test_rdoc_parser_changelog.rb | 40 +++++++++++++++++++++++++++++++++
    	 2 files changed, 48 insertions(+), 3 deletions(-)
    
    	[ruby/rdoc] Skip non-date logs by git-log
    
    	`RDoc::Parser::ChangeLog` mis-parses ChangeLog generated by
    	git-log, because of too heuristic `Time.parse`.
    
    	For instance, "commit 8187228d"
    	results in "8187-08-16", that is, day 228 in the year 8187.
    
    	https://github.com/ruby/rdoc/commit/9711e6f6d9
    	---
    	 lib/rdoc/parser/changelog.rb            | 36 ++++++++++++++++++++-------------
    	 test/rdoc/test_rdoc_parser_changelog.rb |  2 ++
    	 2 files changed, 24 insertions(+), 14 deletions(-)
    
    	[ruby/rdoc] Support other date formats in git-log
    
    	https://github.com/ruby/rdoc/commit/ad8cf37d72
    	---
    	 lib/rdoc/parser/changelog.rb            |  6 +++---
    	 test/rdoc/test_rdoc_parser_changelog.rb | 22 ++++++++++++++++++++++
    	 2 files changed, 25 insertions(+), 3 deletions(-)
    
    	[ruby/rdoc] Support iso-strict format in git-log
    
    	https://github.com/ruby/rdoc/commit/2a6c22da63
    	---
    	 lib/rdoc/parser/changelog.rb            |  6 +++---
    	 test/rdoc/test_rdoc_parser_changelog.rb | 11 +++++++++++
    	 2 files changed, 14 insertions(+), 3 deletions(-)
    
    	[ruby/rdoc] Update Rdoc.css sidebar panel.
    
    	Updates css so the sidebar look like a panel instead of looking like chopped edges.
    
    	https://github.com/ruby/rdoc/commit/b0098c6d72
    	---
    	 lib/rdoc/generator/template/darkfish/css/rdoc.css | 1 +
    	 1 file changed, 1 insertion(+)
    
    	[ruby/rdoc] Support GFM table
    
    	https://github.com/ruby/rdoc/commit/9dc933df16
    	---
    	 lib/rdoc/markdown.rb                    | 349 +++++++++++++++++++++++++++++++-
    	 lib/rdoc/markup.rb                      |   1 +
    	 lib/rdoc/markup/table.rb                |  47 +++++
    	 lib/rdoc/markup/to_html.rb              |  23 +++
    	 lib/rdoc/markup/to_joined_paragraph.rb  |   1 +
    	 lib/rdoc/markup/to_rdoc.rb              |  28 +++
    	 lib/rdoc/markup/to_table_of_contents.rb |   1 +
    	 test/rdoc/test_rdoc_markdown.rb         |  23 +++
    	 8 files changed, 471 insertions(+), 2 deletions(-)
    	 create mode 100644 lib/rdoc/markup/table.rb
    
    	[ruby/rdoc] Add table style
    
    	https://github.com/ruby/rdoc/commit/2219c5ae80
    	---
    	 lib/rdoc/generator/template/darkfish/css/rdoc.css | 19 +++++++++++++++++++
    	 1 file changed, 19 insertions(+)
    
    	[ruby/rdoc] Fixed CodeFence without blank lines
    
    	Currently a fenced code block needs a preceding blank line, it
    	should not be required, as:
    	https://github.github.com/gfm/#fenced-code-blocks
    	> A fenced code block may interrupt a paragraph, and does not
    	> require a blank line either before or after.
    
    	Just recommended:
    	https://docs.github.com/en/github/writing-on-github/creating-and-highlighting-code-blocks
    	> We recommend placing a blank line before and after code blocks
    	> to make the raw formatting easier to read.
    
    	https://github.com/ruby/rdoc/commit/0e1776caf3
    	---
    	 lib/rdoc/markdown.rb            | 447 +++++++---------------------------------
    	 test/rdoc/test_rdoc_markdown.rb |  36 +++-
    	 2 files changed, 112 insertions(+), 371 deletions(-)
    
    	[ruby/rdoc] Allow partial default values to be overridden with
    	 .rdoc_options
    
    	https://github.com/ruby/rdoc/commit/e14800891f
    	---
    	 lib/rdoc/options.rb         | 34 +++++++++++++++++++++++++++++++++-
    	 lib/rdoc/rdoc.rb            |  7 ++++++-
    	 test/rdoc/test_rdoc_rdoc.rb | 12 ++++++++++++
    	 3 files changed, 51 insertions(+), 2 deletions(-)
    
    	[ruby/rdoc] Allow empty .rdoc_options
    
    	https://github.com/ruby/rdoc/commit/0c8cb25b50
    	---
    	 lib/rdoc/rdoc.rb            |  2 ++
    	 test/rdoc/test_rdoc_rdoc.rb | 11 +++++++++++
    	 2 files changed, 13 insertions(+)
    
    	[ruby/rdoc] Suppress unused variable warning of "text"
    
    	https://github.com/ruby/rdoc/commit/3a4120b155
    	---
    	 lib/rdoc/markdown.rb | 345 ++++++++++++++++++++++++++++++++++++++++++++++++++-
    	 1 file changed, 343 insertions(+), 2 deletions(-)
    
    	[ruby/rdoc] Get rid of a trailing space
    
    	https://github.com/ruby/rdoc/commit/7b7b91768e
    	---
    	 lib/rdoc/markdown.rb | 7 +++----
    	 1 file changed, 3 insertions(+), 4 deletions(-)
    
    	[ruby/rdoc] Disable other notations in <code> tags
    
    	https://github.com/ruby/rdoc/commit/0cd3b55210
    	---
    	 lib/rdoc/markup/attr_span.rb                    |  10 ++-
    	 lib/rdoc/markup/attribute_manager.rb            | 102 ++++++++++++++++++------
    	 test/rdoc/test_rdoc_markup_attribute_manager.rb |  24 +++++-
    	 test/rdoc/test_rdoc_markup_to_html.rb           |   6 ++
    	 4 files changed, 114 insertions(+), 28 deletions(-)
    
    	[ruby/rdoc] Treat other tags as word boundaries
    
    	https://github.com/ruby/rdoc/commit/8222f85a17
    	---
    	 lib/rdoc/markup/attribute_manager.rb  | 17 +++++++++++++----
    	 test/rdoc/test_rdoc_markup_to_html.rb |  5 +++++
    	 2 files changed, 18 insertions(+), 4 deletions(-)
    
    	[ruby/rdoc] Treat emphasis tags as excluding other notations
    
    	And exclusive notations don't exclude other exclusive notations.
    
    	https://github.com/ruby/rdoc/commit/b8baa9a435
    	---
    	 lib/rdoc/markup/attr_span.rb                    |  2 +-
    	 lib/rdoc/markup/attribute_manager.rb            | 10 +++++-----
    	 test/rdoc/test_rdoc_markup_attribute_manager.rb |  1 +
    	 3 files changed, 7 insertions(+), 6 deletions(-)
    
    	[ruby/rdoc] Clarify that dots in URL are replaced
    
    	The dots in all path components from the document root are
    	replaced with underscores, not only in the basename.
    
    	https://github.com/ruby/rdoc/commit/7a3417ea4c
    	---
    	 test/rdoc/test_rdoc_top_level.rb | 3 +++
    	 1 file changed, 3 insertions(+)
    
    	[ruby/rdoc] Links to document texts without "rdoc-ref:" prefix
    
    	While links to generated HTML from RDoc file needs to be prefixed
    	by "rdoc-ref:" currently, in case of explicit references this
    	seems just redundant.
    
    	Also GitHub RDoc support does not work with this prefix.
    
    	This patch lets links to such document texts (".rb", ".rdoc" and
    	".md" now) refer URLs generated by `RDoc::TopLevel#http_url`
    	without the prefix.
    
    	https://github.com/ruby/rdoc/commit/f18b27b69d
    	---
    	 lib/rdoc/markup/to_html.rb            |  4 ++++
    	 test/rdoc/test_rdoc_markup_to_html.rb | 21 +++++++++++++++++++++
    	 2 files changed, 25 insertions(+)
    
    	[ruby/rdoc] Use File.open to fix the OS Command Injection
    	 vulnerability in CVE-2021-31799
    
    	https://github.com/ruby/rdoc/commit/a7f5d6ab88
    	---
    	 lib/rdoc/rdoc.rb            |  2 +-
    	 test/rdoc/test_rdoc_rdoc.rb | 12 ++++++++++++
    	 2 files changed, 13 insertions(+), 1 deletion(-)
    
    	[ruby/rdoc] Version 6.3.1
    
    	https://github.com/ruby/rdoc/commit/9307f932b7
    	---
    	 lib/rdoc/version.rb | 2 +-
    	 1 file changed, 1 insertion(+), 1 deletion(-)
Loading