Merge branch '46849-update-rdoc-to-6-0-4' into 'master'
Update rdoc to 6.0.4 Closes #46849 See merge request gitlab-org/gitlab-ce!19167
This commit is contained in:
commit
0d32ec447f
2
Gemfile
2
Gemfile
|
@ -133,7 +133,7 @@ gem 'gitlab-markup', '~> 1.6.2'
|
|||
gem 'redcarpet', '~> 3.4'
|
||||
gem 'commonmarker', '~> 0.17'
|
||||
gem 'RedCloth', '~> 4.3.2'
|
||||
gem 'rdoc', '~> 4.2'
|
||||
gem 'rdoc', '~> 6.0'
|
||||
gem 'org-ruby', '~> 0.9.12'
|
||||
gem 'creole', '~> 0.5.0'
|
||||
gem 'wikicloth', '0.8.1'
|
||||
|
|
|
@ -694,8 +694,7 @@ GEM
|
|||
ffi
|
||||
rbnacl-libsodium (1.0.11)
|
||||
rbnacl (>= 3.0.1)
|
||||
rdoc (4.2.2)
|
||||
json (~> 1.4)
|
||||
rdoc (6.0.4)
|
||||
re2 (1.1.1)
|
||||
recaptcha (3.0.0)
|
||||
json
|
||||
|
@ -1124,7 +1123,7 @@ DEPENDENCIES
|
|||
rblineprof (~> 0.3.6)
|
||||
rbnacl (~> 4.0)
|
||||
rbnacl-libsodium
|
||||
rdoc (~> 4.2)
|
||||
rdoc (~> 6.0)
|
||||
re2 (~> 1.1.1)
|
||||
recaptcha (~> 3.0)
|
||||
redcarpet (~> 3.4)
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Update rdoc to 6.0.4
|
||||
merge_request: 19167
|
||||
author: Takuya Noguchi
|
||||
type: other
|
Loading…
Reference in New Issue