diff options
| author | Stan Hu <stanhu@gmail.com> | 2021-07-09 11:00:19 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2021-07-09 11:02:49 +0300 |
| commit | 2f691bf85adfd20e66c046b883e11c694ec0ccc9 (patch) | |
| tree | a5e0f967f4210978bc02f56a12c430273a84fe7b | |
| parent | fef798978197809e268e5395838b4f4eeb4288e9 (diff) | |
Update google-protobuf to v3.17.1 and labkit-ruby to v0.20.0
`Gemfile.lock` was not updated properly, and we should update
google-protobuf to the version used by GitLab Rails.
Closes https://gitlab.com/gitlab-org/gitaly/-/issues/3695
Changelog: changed
| -rw-r--r-- | ruby/Gemfile | 4 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/ruby/Gemfile b/ruby/Gemfile index 20f1034fc..df20b294b 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -13,13 +13,13 @@ gem 'faraday', '~> 1.0' gem 'rbtrace', require: false # Labkit provides observability functionality -gem 'gitlab-labkit', '~> 0.17.1' +gem 'gitlab-labkit', '~> 0.20.0' # Detects the open source license the repository includes # This version needs to be in sync with GitLab CE/EE gem 'licensee', '~> 9.14.1' -gem 'google-protobuf', '~> 3.14.0' +gem 'google-protobuf', '~> 3.17.0' group :development, :test do gem 'rubocop', '~> 0.69', require: false diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index af6a3ce81..fe844f3ea 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -65,16 +65,16 @@ GEM gitlab-gollum-rugged_adapter (0.4.4.4.gitlab.1) mime-types (>= 1.15) rugged (~> 1.0) - gitlab-labkit (0.17.1) + gitlab-labkit (0.20.0) actionpack (>= 5.0.0, < 7.0.0) activesupport (>= 5.0.0, < 7.0.0) grpc (~> 1.19) jaeger-client (~> 1.1) opentracing (~> 0.4) - pg_query (~> 2.0) + pg_query (~> 2.1) redis (> 3.0.0, < 5.0.0) gitlab-markup (1.7.1) - google-protobuf (3.14.0) + google-protobuf (3.17.3) googleapis-common-protos-types (1.0.5) google-protobuf (~> 3.11) grpc (1.30.2) @@ -121,8 +121,8 @@ GEM parallel (1.19.2) parser (2.7.2.0) ast (~> 2.4.1) - pg_query (2.0.3) - google-protobuf (~> 3.15.5) + pg_query (2.1.0) + google-protobuf (>= 3.17.1) proc_to_ast (0.1.0) coderay parser @@ -222,9 +222,9 @@ DEPENDENCIES github-linguist (~> 7.12) gitlab-gollum-lib (~> 4.2.7.10.gitlab.1) gitlab-gollum-rugged_adapter (~> 0.4.4.4.gitlab.1) - gitlab-labkit (~> 0.17.1) + gitlab-labkit (~> 0.20.0) gitlab-markup (~> 1.7.1) - google-protobuf (~> 3.14.0) + google-protobuf (~> 3.17.0) grpc (~> 1.30.2) grpc-tools (= 1.30.2) licensee (~> 9.14.1) |