diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-05-29 15:06:19 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-05-29 15:06:19 +0000 |
| commit | 0d32ec447f54be0aa43b869dc6e6ff6743e6883f (patch) | |
| tree | 3c084d8bf881dcbd4f9589aa6e8393728d387488 | |
| parent | a6b828ca0c7ce580f684ad3a7a772f76c3a93bc9 (diff) | |
| parent | 2476801b0c74f99cdf806a11108d8082f6509f50 (diff) | |
| download | gitlab-ce-0d32ec447f54be0aa43b869dc6e6ff6743e6883f.tar.gz | |
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
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/46849-update-rdoc-to-6-0-4.yml | 5 |
3 files changed, 8 insertions, 4 deletions
@@ -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' diff --git a/Gemfile.lock b/Gemfile.lock index b0b7bb537a8..7a3ed89d803 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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) diff --git a/changelogs/unreleased/46849-update-rdoc-to-6-0-4.yml b/changelogs/unreleased/46849-update-rdoc-to-6-0-4.yml new file mode 100644 index 00000000000..cf0436df1a7 --- /dev/null +++ b/changelogs/unreleased/46849-update-rdoc-to-6-0-4.yml @@ -0,0 +1,5 @@ +--- +title: Update rdoc to 6.0.4 +merge_request: 19167 +author: Takuya Noguchi +type: other |