summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-09-01 07:13:49 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-09-01 07:13:49 +0000
commitfb58d337f0b8b6f685c1e94a9327d8d12ebfbf81 (patch)
treea285b8beb8303a81a7af0db968822fa05595e529 /Gemfile.lock
parent3333112d46dd179a55295ebed754544a97b49b7f (diff)
downloadgitlab-ce-fb58d337f0b8b6f685c1e94a9327d8d12ebfbf81.tar.gz
Add latest changes from gitlab-org/gitlab@14-2-stable-ee
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock12
1 files changed, 6 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index da82c2ee5c1..3ff3f6ca76f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -475,10 +475,10 @@ GEM
fog-json (~> 1.2.0)
mime-types
ms_rest_azure (~> 0.12.0)
- gitlab-labkit (0.21.0)
+ gitlab-labkit (0.21.1)
actionpack (>= 5.0.0, < 7.0.0)
activesupport (>= 5.0.0, < 7.0.0)
- grpc (~> 1.38)
+ grpc (~> 1.30.2)
jaeger-client (~> 1.1)
opentracing (~> 0.4)
pg_query (~> 2.1)
@@ -573,8 +573,8 @@ GEM
graphql (~> 1.6)
html-pipeline (~> 2.8)
sass (~> 3.4)
- grpc (1.38.0)
- google-protobuf (~> 3.15)
+ grpc (1.30.2)
+ google-protobuf (~> 3.12)
googleapis-common-protos-types (~> 1.0)
gssapi (1.2.0)
ffi (>= 1.0.1)
@@ -1477,7 +1477,7 @@ DEPENDENCIES
gitlab-dangerfiles (~> 2.3.0)
gitlab-experiment (~> 0.6.4)
gitlab-fog-azure-rm (~> 1.1.1)
- gitlab-labkit (~> 0.21.0)
+ gitlab-labkit (~> 0.21.1)
gitlab-license (~> 2.0)
gitlab-mail_room (~> 0.0.9)
gitlab-markup (~> 1.7.1)
@@ -1499,7 +1499,7 @@ DEPENDENCIES
graphlient (~> 0.4.0)
graphql (~> 1.11.8)
graphql-docs (~> 1.6.0)
- grpc (~> 1.38.0)
+ grpc (~> 1.30.2)
gssapi
guard-rspec
haml_lint (~> 0.36.0)