summaryrefslogtreecommitdiff
path: root/Gemfile.lock
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.lock
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.lock')
-rw-r--r--Gemfile.lock5
1 files changed, 2 insertions, 3 deletions
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)