From 2476801b0c74f99cdf806a11108d8082f6509f50 Mon Sep 17 00:00:00 2001
From: Takuya Noguchi <takninnovationresearch@gmail.com>
Date: Sun, 27 May 2018 01:30:24 +0900
Subject: [PATCH] Update rdoc to 6.0.4

---
 Gemfile                                              | 2 +-
 Gemfile.lock                                         | 5 ++---
 changelogs/unreleased/46849-update-rdoc-to-6-0-4.yml | 5 +++++
 3 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100644 changelogs/unreleased/46849-update-rdoc-to-6-0-4.yml

diff --git a/Gemfile b/Gemfile
index cc0758f7c57..5650b86cd0b 100644
--- a/Gemfile
+++ b/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'
diff --git a/Gemfile.lock b/Gemfile.lock
index 7332b55c175..1c2a5509d3e 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