Commit 3e2feecf authored by Stan Hu's avatar Stan Hu

Merge branch 'jl-bump-rdoc-6.2' into 'master'

Update rdoc to 6.1.2

Closes #39147

See merge request gitlab-org/gitlab!22434
parents 1a0d4c64 f3b53799
...@@ -142,7 +142,7 @@ gem 'gitlab-markup', '~> 1.7.0' ...@@ -142,7 +142,7 @@ gem 'gitlab-markup', '~> 1.7.0'
gem 'github-markup', '~> 1.7.0', require: 'github/markup' gem 'github-markup', '~> 1.7.0', require: 'github/markup'
gem 'commonmarker', '~> 0.20' gem 'commonmarker', '~> 0.20'
gem 'RedCloth', '~> 4.3.2' gem 'RedCloth', '~> 4.3.2'
gem 'rdoc', '~> 6.0' gem 'rdoc', '~> 6.1.2'
gem 'org-ruby', '~> 0.9.12' gem 'org-ruby', '~> 0.9.12'
gem 'creole', '~> 0.5.0' gem 'creole', '~> 0.5.0'
gem 'wikicloth', '0.8.1' gem 'wikicloth', '0.8.1'
......
...@@ -823,7 +823,7 @@ GEM ...@@ -823,7 +823,7 @@ GEM
ffi (>= 1.0.6) ffi (>= 1.0.6)
msgpack (>= 0.4.3) msgpack (>= 0.4.3)
optimist (>= 3.0.0) optimist (>= 3.0.0)
rdoc (6.0.4) rdoc (6.1.2)
re2 (1.1.1) re2 (1.1.1)
recaptcha (4.13.1) recaptcha (4.13.1)
json json
...@@ -1308,7 +1308,7 @@ DEPENDENCIES ...@@ -1308,7 +1308,7 @@ DEPENDENCIES
raindrops (~> 0.18) raindrops (~> 0.18)
rblineprof (~> 0.3.6) rblineprof (~> 0.3.6)
rbtrace (~> 0.4) rbtrace (~> 0.4)
rdoc (~> 6.0) rdoc (~> 6.1.2)
re2 (~> 1.1.1) re2 (~> 1.1.1)
recaptcha (~> 4.11) recaptcha (~> 4.11)
redis (~> 4.0) redis (~> 4.0)
......
---
title: Update rdoc to 6.1.2
merge_request: 22434
author:
type: security
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment