Commit db4848d1 authored by Stan Hu's avatar Stan Hu

Merge branch 'revert-bd6ba232' into 'master'

Revert update google-protobuf to 3.15.8

See merge request gitlab-org/gitlab!60918
parents 6e317521 50bd018d
...@@ -485,7 +485,7 @@ gem 'gitaly', '~> 13.11.0.pre.rc1' ...@@ -485,7 +485,7 @@ gem 'gitaly', '~> 13.11.0.pre.rc1'
gem 'grpc', '~> 1.30.2' gem 'grpc', '~> 1.30.2'
gem 'google-protobuf', '~> 3.15.8' gem 'google-protobuf', '~> 3.14.0'
gem 'toml-rb', '~> 1.0.0' gem 'toml-rb', '~> 1.0.0'
......
...@@ -518,7 +518,7 @@ GEM ...@@ -518,7 +518,7 @@ GEM
signet (~> 0.12) signet (~> 0.12)
google-cloud-env (1.4.0) google-cloud-env (1.4.0)
faraday (>= 0.17.3, < 2.0) faraday (>= 0.17.3, < 2.0)
google-protobuf (3.15.8) google-protobuf (3.14.0)
googleapis-common-protos-types (1.0.5) googleapis-common-protos-types (1.0.5)
google-protobuf (~> 3.11) google-protobuf (~> 3.11)
googleauth (0.14.0) googleauth (0.14.0)
...@@ -1466,7 +1466,7 @@ DEPENDENCIES ...@@ -1466,7 +1466,7 @@ DEPENDENCIES
gitlab_omniauth-ldap (~> 2.1.1) gitlab_omniauth-ldap (~> 2.1.1)
gon (~> 6.4.0) gon (~> 6.4.0)
google-api-client (~> 0.33) google-api-client (~> 0.33)
google-protobuf (~> 3.15.8) google-protobuf (~> 3.14.0)
gpgme (~> 2.0.19) gpgme (~> 2.0.19)
grape (~> 1.5.2) grape (~> 1.5.2)
grape-entity (~> 0.7.1) 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