BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 0d32ec44 by Robert Speicher
Options

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
parents a6b828ca 2476801b
Showing with 8 additions and 4 deletions
Gemfile
...@@ -133,7 +133,7 @@ gem 'gitlab-markup', '~> 1.6.2' ...@@ -133,7 +133,7 @@ gem 'gitlab-markup', '~> 1.6.2'
gem 'redcarpet', '~> 3.4' gem 'redcarpet', '~> 3.4'
gem 'commonmarker', '~> 0.17' gem 'commonmarker', '~> 0.17'
gem 'RedCloth', '~> 4.3.2' gem 'RedCloth', '~> 4.3.2'
gem 'rdoc', '~> 4.2' gem 'rdoc', '~> 6.0'
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'
......
Gemfile.lock
...@@ -694,8 +694,7 @@ GEM ...@@ -694,8 +694,7 @@ GEM
ffi ffi
rbnacl-libsodium (1.0.11) rbnacl-libsodium (1.0.11)
rbnacl (>= 3.0.1) rbnacl (>= 3.0.1)
rdoc (4.2.2) rdoc (6.0.4)
json (~> 1.4)
re2 (1.1.1) re2 (1.1.1)
recaptcha (3.0.0) recaptcha (3.0.0)
json json
...@@ -1124,7 +1123,7 @@ DEPENDENCIES ...@@ -1124,7 +1123,7 @@ DEPENDENCIES
rblineprof (~> 0.3.6) rblineprof (~> 0.3.6)
rbnacl (~> 4.0) rbnacl (~> 4.0)
rbnacl-libsodium rbnacl-libsodium
rdoc (~> 4.2) rdoc (~> 6.0)
re2 (~> 1.1.1) re2 (~> 1.1.1)
recaptcha (~> 3.0) recaptcha (~> 3.0)
redcarpet (~> 3.4) redcarpet (~> 3.4)
......
changelogs/unreleased/46849-update-rdoc-to-6-0-4.yml 0 → 100644
---
title: Update rdoc to 6.0.4
merge_request: 19167
author: Takuya Noguchi
type: other
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