summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-07 00:07:50 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-07 00:07:50 +0000
commitd95abc0bc994436aa963347bed29e264d5158fa5 (patch)
treefe2aab72e133e2913cba0959efd88fdb75669b91 /Gemfile
parent015663b70f1bcdae4483e38c2beac884f92da5b8 (diff)
downloadgitlab-ce-d95abc0bc994436aa963347bed29e264d5158fa5.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 428d7413a32..09aab81778c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -142,7 +142,7 @@ gem 'gitlab-markup', '~> 1.7.0'
gem 'github-markup', '~> 1.7.0', require: 'github/markup'
gem 'commonmarker', '~> 0.20'
gem 'RedCloth', '~> 4.3.2'
-gem 'rdoc', '~> 6.0'
+gem 'rdoc', '~> 6.1.2'
gem 'org-ruby', '~> 0.9.12'
gem 'creole', '~> 0.5.0'
gem 'wikicloth', '0.8.1'