summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-10-20 09:10:20 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-10-20 09:10:20 +0000
commit3f96425b0b9f0b4885b70db01dcd76b311ea87ab (patch)
tree0f42e42ca0876d9deca1d9cda83165ec510876e5 /Gemfile.lock
parentba2e4183d9b07237657595821cd06689667e6762 (diff)
downloadgitlab-ce-3f96425b0b9f0b4885b70db01dcd76b311ea87ab.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock12
1 files changed, 7 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 8bf67a41f45..d2b6d367ae4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -619,7 +619,7 @@ GEM
signet (~> 0.12)
google-cloud-env (1.6.0)
faraday (>= 0.17.3, < 3.0)
- google-protobuf (3.21.7)
+ google-protobuf (3.21.8)
googleapis-common-protos-types (1.3.0)
google-protobuf (~> 3.14)
googleauth (0.14.0)
@@ -741,7 +741,9 @@ GEM
i18n (1.12.0)
concurrent-ruby (~> 1.0)
i18n_data (0.8.0)
- icalendar (2.4.1)
+ icalendar (2.8.0)
+ ice_cube (~> 0.16)
+ ice_cube (0.16.4)
imagen (0.1.8)
parser (>= 2.5, != 2.5.1.1)
invisible_captcha (1.1.0)
@@ -1640,7 +1642,7 @@ DEPENDENCIES
gitlab_omniauth-ldap (~> 2.2.0)
gon (~> 6.4.0)
google-api-client (~> 0.33)
- google-protobuf (~> 3.21)
+ google-protobuf (~> 3.21, >= 3.21.8)
gpgme (~> 2.0.19)
grape (~> 1.5.2)
grape-entity (~> 0.10.0)
@@ -1756,7 +1758,7 @@ DEPENDENCIES
redis (~> 4.7.0)
redis-actionpack (~> 5.3.0)
redis-namespace (~> 1.9.0)
- request_store (~> 1.5)
+ request_store (~> 1.5.1)
responders (~> 3.0)
retriable (~> 3.1.2)
rexml (~> 3.2.5)
@@ -1833,4 +1835,4 @@ DEPENDENCIES
yajl-ruby (~> 1.4.3)
BUNDLED WITH
- 2.3.23
+ 2.3.24