summaryrefslogtreecommitdiff
path: root/Gemfile.lock
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.lock
parent015663b70f1bcdae4483e38c2beac884f92da5b8 (diff)
downloadgitlab-ce-d95abc0bc994436aa963347bed29e264d5158fa5.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 35aa419e2e2..91376b5ee58 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -823,7 +823,7 @@ GEM
ffi (>= 1.0.6)
msgpack (>= 0.4.3)
optimist (>= 3.0.0)
- rdoc (6.0.4)
+ rdoc (6.1.2)
re2 (1.1.1)
recaptcha (4.13.1)
json
@@ -1308,7 +1308,7 @@ DEPENDENCIES
raindrops (~> 0.18)
rblineprof (~> 0.3.6)
rbtrace (~> 0.4)
- rdoc (~> 6.0)
+ rdoc (~> 6.1.2)
re2 (~> 1.1.1)
recaptcha (~> 4.11)
redis (~> 4.0)