Commit 1ed3d56c authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'fix/google-protobuf-dep' into 'master'

Set google-protobuf dependency to a version that works

See merge request gitlab-org/gitlab!55972
parents 13d059fa 97fa2f11
......@@ -480,7 +480,7 @@ gem 'gitaly', '~> 13.9.0.pre.rc1'
gem 'grpc', '~> 1.30.2'
gem 'google-protobuf', '~> 3.12'
gem 'google-protobuf', '~> 3.14.0'
gem 'toml-rb', '~> 1.0.0'
......
......@@ -507,7 +507,7 @@ GEM
signet (~> 0.12)
google-cloud-env (1.4.0)
faraday (>= 0.17.3, < 2.0)
google-protobuf (3.12.4)
google-protobuf (3.14.0)
googleapis-common-protos-types (1.0.5)
google-protobuf (~> 3.11)
googleauth (0.14.0)
......@@ -1439,7 +1439,7 @@ DEPENDENCIES
gitlab_omniauth-ldap (~> 2.1.1)
gon (~> 6.2)
google-api-client (~> 0.33)
google-protobuf (~> 3.12)
google-protobuf (~> 3.14.0)
gpgme (~> 2.0.19)
grape (~> 1.5.2)
grape-entity (~> 0.7.1)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment