summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-06-30 11:44:35 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-06-30 11:45:00 +0000
commit64ed8e1d79a385fef8bf3da630a1d5c5f9b9577b (patch)
tree9f2f8d0244ed217a6d0ffa8daf21b69f74f6c939 /Gemfile.lock
parent484b5969a0bc74086355d7a3d64dc38278907e08 (diff)
downloadgitlab-ce-64ed8e1d79a385fef8bf3da630a1d5c5f9b9577b.tar.gz
Add latest changes from gitlab-org/security/gitlab@13-12-stable-ee
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 8c94778a6f1..b6a2ff32257 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -483,6 +483,7 @@ GEM
addressable (~> 2.7)
omniauth (~> 1.9)
openid_connect (~> 1.2)
+ gitlab-rdoc (6.3.2)
gitlab-sidekiq-fetcher (0.5.6)
sidekiq (~> 5)
gitlab-styles (6.2.0)
@@ -1008,7 +1009,6 @@ GEM
msgpack (>= 0.4.3)
optimist (>= 3.0.0)
rchardet (1.8.0)
- rdoc (6.1.2)
re2 (1.2.0)
recaptcha (4.13.1)
json
@@ -1485,6 +1485,7 @@ DEPENDENCIES
gitlab-markup (~> 1.7.1)
gitlab-net-dns (~> 0.9.1)
gitlab-omniauth-openid-connect (~> 0.4.0)
+ gitlab-rdoc (~> 6.3.2)
gitlab-sidekiq-fetcher (= 0.5.6)
gitlab-styles (~> 6.2.0)
gitlab_chronic_duration (~> 0.10.6.2)
@@ -1594,7 +1595,6 @@ DEPENDENCIES
raindrops (~> 0.18)
rblineprof (~> 0.3.6)
rbtrace (~> 0.4)
- rdoc (~> 6.1.2)
re2 (~> 1.2.0)
recaptcha (~> 4.11)
redis (~> 4.0)