diff options
| author | Sami Hiltunen <shiltunen@gitlab.com> | 2022-07-27 17:54:51 +0300 |
|---|---|---|
| committer | Sami Hiltunen <shiltunen@gitlab.com> | 2022-07-27 17:54:51 +0300 |
| commit | 333f08084c4459b14cf593d049cae4ce82b2785c (patch) | |
| tree | 5b77d91e3faa019ec1cd41ad2483d98f9d7803d2 | |
| parent | 152a89bde858b334f8517b83667be6667b684431 (diff) | |
| parent | c8cf249ff66ac6011ab25298119210e56745ff8c (diff) | |
Merge branch 'sh-bump-google-protobuf-ruby' into 'master'
Update google-protobuf Ruby gem to v3.21.3
See merge request gitlab-org/gitaly!4762
| -rw-r--r-- | ruby/Gemfile | 2 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ruby/Gemfile b/ruby/Gemfile index 3ffb5fc00..855c28efc 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -19,7 +19,7 @@ gem 'gitlab-labkit', '~> 0.23' # This version needs to be in sync with GitLab CE/EE gem 'licensee', '~> 9.14.1' -gem 'google-protobuf', '~> 3.19.0' +gem 'google-protobuf', '~> 3.21.0' group :development, :test do gem 'rubocop', '~> 0.69', require: false diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index 2d24d8eb1..12e5d578a 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -81,7 +81,7 @@ GEM with_env (= 1.1.0) xml-simple (~> 1.1.5) gitlab-markup (1.7.1) - google-protobuf (3.19.1) + google-protobuf (3.21.3) googleapis-common-protos-types (1.3.0) google-protobuf (~> 3.14) grpc (1.42.0) @@ -234,7 +234,7 @@ DEPENDENCIES gitlab-labkit (~> 0.23) gitlab-license_finder gitlab-markup (~> 1.7.1) - google-protobuf (~> 3.19.0) + google-protobuf (~> 3.21.0) grpc (~> 1.42.0) grpc-tools (~> 1.42.0) licensee (~> 9.14.1) |