From f9bcdf86b2c8ea9c75482dace154e0bcbb2e4f48 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Fri, 22 Jul 2022 12:35:16 -0700
Subject: [PATCH] Update google-protobuf to v3.21.3
This not only addresses CVE-2021-22569, but it also pulls in all the
big endian fixes made towards supporting s390x
(https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/6435).
Changelog: changed
---
Gemfile | 2 +-
Gemfile.lock | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Gemfile b/Gemfile
index eab05b3397237..1081ba85dbeaa 100644
--- a/Gemfile
+++ b/Gemfile
@@ -493,7 +493,7 @@ gem 'kas-grpc', '~> 0.0.2'
gem 'grpc', '~> 1.42.0'
-gem 'google-protobuf', '~> 3.19.0'
+gem 'google-protobuf', '~> 3.21'
gem 'toml-rb', '~> 2.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index ddba30d25748a..4da5e6e883921 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -580,7 +580,7 @@ GEM
signet (~> 0.12)
google-cloud-env (1.5.0)
faraday (>= 0.17.3, < 2.0)
- google-protobuf (3.19.4)
+ google-protobuf (3.21.3)
googleapis-common-protos-types (1.3.0)
google-protobuf (~> 3.14)
googleauth (0.14.0)
@@ -1580,7 +1580,7 @@ DEPENDENCIES
gitlab_omniauth-ldap (~> 2.2.0)
gon (~> 6.4.0)
google-api-client (~> 0.33)
- google-protobuf (~> 3.19.0)
+ google-protobuf (~> 3.21)
gpgme (~> 2.0.19)
grape (~> 1.5.2)
grape-entity (~> 0.10.0)
--
GitLab