summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2018-05-29 15:06:19 +0000
committerRobert Speicher <robert@gitlab.com>2018-05-29 15:06:19 +0000
commit0d32ec447f54be0aa43b869dc6e6ff6743e6883f (patch)
tree3c084d8bf881dcbd4f9589aa6e8393728d387488 /Gemfile
parenta6b828ca0c7ce580f684ad3a7a772f76c3a93bc9 (diff)
parent2476801b0c74f99cdf806a11108d8082f6509f50 (diff)
downloadgitlab-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
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index b6b82bad8a4..45aab1df0f8 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'