1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Commit graph

16 commits

Author SHA1 Message Date
nagachika
2a70d21484 merge revision(s) b1c73f239fe9af97de837331849f55d67c27561e,bb570ce6d80d28cfc7131dcb72885eed2f989b30,b88d1e6b44164bca0c2b85ea6639469813e1e1d8,127f735c1e5e0771076caf2a74390757a42fb177,f3f1a666c77f8c528b0adc9ccf78e4b9910bd6e0,fa048a0f8523cefde5428805dd334691486319e6,d5d1c41728d65acfb8aa2cf95f2d8ac88f271cd1,52ebaf718e6a78297ceb0dff49815eeed28eae45,7fe22152fc28084f4395fece84ff6e5eb2d6b288,19e6d271266eca5925e66fc8ec39b251a2fa6bcd,05898c5b9001c0b1e8bd7bf0d12b42a8e7c388b8,3651f678a719ae3a35825bcb4e0dabbc7c60d8df,10b082064e6ab0943cce4ef43e567d8044c7096d,de8e6218a3257fe19b46ff0aa157e66f452ac8b7,971a0cd246db6578e1ea8760a903e1a23e3681f3,61a29a41e1d0d11a9963315aa86d25ed690124c0,ff9a00887161840eb8a34d53749a7d7962181cfe,fad3412d475b57055f426cf4e86eafeab516672b,54aa11efa8b1be2c5d20402890d6d2fa90aa19a8,e84d275fe6d0c14ba58ce73b13323879c060b7ae,61e1cf23ac0d122fba3ad4cbaa402c7c94ad54d3,a6948329f8f89fb390215086fe4a888915fd589e,64b991b0cd98ee8f23266b8cbea0fa34bdaab1ec,b1c73f239fe9af97de837331849f55d67c27561e,0ee24b4fab1a1faef600a42c29863e1c3edd8c61: [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

	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`

	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

	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

	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

	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

	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

	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 8187228de0"
	results in "8187-08-16", that is, day 228 in the year 8187.

	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

	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

	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.

	b0098c6d72
	---
	 lib/rdoc/generator/template/darkfish/css/rdoc.css | 1 +
	 1 file changed, 1 insertion(+)

	[ruby/rdoc] Support GFM table

	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

	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.

	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

	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

	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"

	3a4120b155
	---
	 lib/rdoc/markdown.rb | 345 ++++++++++++++++++++++++++++++++++++++++++++++++++-
	 1 file changed, 343 insertions(+), 2 deletions(-)

	[ruby/rdoc] Get rid of a trailing space

	7b7b91768e
	---
	 lib/rdoc/markdown.rb | 7 +++----
	 1 file changed, 3 insertions(+), 4 deletions(-)

	[ruby/rdoc] Disable other notations in <code> tags

	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

	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.

	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.

	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.

	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

	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

	9307f932b7
	---
	 lib/rdoc/version.rb | 2 +-
	 1 file changed, 1 insertion(+), 1 deletion(-)
2021-05-22 14:51:55 +09:00
aycabta
1b43644edc Merge rdoc-6.1.0.beta2
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65106 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2018-10-17 06:28:20 +00:00
hsbt
5551871086 Merge rdoc-6.0.0.beta4 from upstream.
It version applied `frozen_string_literal: true`

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60920 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2017-11-27 10:45:24 +00:00
naruse
3e92b635fb Add frozen_string_literal: false for all files
When you change this to true, you may need to add more tests.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53141 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-16 05:07:31 +00:00
hsbt
80325bab52 * lib/rdoc.rb, lib/rdoc, test/rdoc: Update to RDoc 4.2.0.alpha(21b241a)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47521 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-09-11 01:03:22 +00:00
drbrain
df7dac9174 * lib/rdoc: Update to RDoc 4.1.0.preview.1
RDoc 4.1.0 contains a number of enhancements including a new default
  style and accessibility support.  You can see the changelog here:

  https://github.com/rdoc/rdoc/blob/v4.1.0.preview.1/History.rdoc

* test/rdoc:  ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42971 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-09-18 23:33:36 +00:00
drbrain
810008293f * lib/rdoc.rb: Updated VERSION.
* lib/rdoc/markup/attribute_manager.rb:  Removed useless empty check.

	* lib/rdoc/markup/to_markdown.rb:  Support links from other formats.
	* lib/rdoc/markup/formatter.rb:  ditto.
	* lib/rdoc/markup/to_html.rb:  ditto.
	* test/rdoc/test_rdoc_markup_formatter.rb:  Test for above.
	* test/rdoc/test_rdoc_markup_to_html.rb:  ditto.
	* test/rdoc/test_rdoc_markup_to_markdown.rb:  ditto.

	* lib/rdoc/rd/block_parser.rb:  Improved footnote display.  Worked
	  around bug in footnote conversion to Markdown.
	* test/rdoc/test_rdoc_rd_block_parser.rb:  Test for above.

	* lib/rdoc/rd/inline_parser.rb:  Fixed bug with emphasis inside
	  verbatim.
	* test/rdoc/test_rdoc_rd_inline_parser.rb:  Test for above.

	* test/rdoc/test_rdoc_parser_rd.rb:  Use mu_pp, use shortcut methods.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38418 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-12-16 23:07:49 +00:00
drbrain
1c279a7d27 * lib/rdoc*: Updated to RDoc 4.0 (pre-release)
* bin/rdoc:  ditto
* test/rdoc:  ditto
* NEWS:  Updated with RDoc 4.0 information


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37889 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-11-27 04:28:14 +00:00
drbrain
cc2a16d94d Import RDoc 3.5.1
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30760 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-02 00:32:30 +00:00
drbrain
2ef9c50c6e Import RDoc 3
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30249 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-20 03:22:49 +00:00
marcandre
571ed8655f * lib/rdoc/*.rb: Remove unused variable warnings.
Patch by Run Paint [ruby-core:30991]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29724 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-11-08 20:58:28 +00:00
tenderlove
1df8d6dbc3 * lib/rdoc/markup/attribute_manager.rb: fixing ri output when special
characters are inside html tags.  Thanks Tomo Kazahaya! [Bug #3512]
* test/rdoc/test_attribute_manager.rb: corresponding test.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28647 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-07-14 21:13:41 +00:00
drbrain
46580b5147 Import RDoc 2.5
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27147 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-04-01 07:45:16 +00:00
drbrain
cd9e9c6deb Update to RDoc 2.1.0 r112
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18147 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-07-21 18:35:14 +00:00
drbrain
fd25f74d64 Import RDoc r101.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18121 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-07-18 00:46:16 +00:00
drbrain
c42a631063 Import RDoc 2.0.0 r56.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16212 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-04-26 16:14:19 +00:00