diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 62d572c550a3bb02c9b1869dba91a761dffa65f8..35310f489d4fe8a3bca6c89c9e188047a94b4c81 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -e02b0d67e48ed5a4493b073c9836d376a780f34d +7055518ce76486791c3450a8a47b673891b6e2d6 diff --git a/Gemfile b/Gemfile index 786fdadd157bd8cdd4ad54f0cad9af81fbcfdbf3..c80163de909ca9e0fc59298ba3ee1425d65b7dbb 100644 --- a/Gemfile +++ b/Gemfile @@ -313,7 +313,7 @@ gem 'pg_query', '~> 2.1' gem 'premailer-rails', '~> 1.10.3' # LabKit: Tracing and Correlation -gem 'gitlab-labkit', '~> 0.21.1' +gem 'gitlab-labkit', '~> 0.21.3' # Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0 # because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900 gem 'thrift', '>= 0.14.0' @@ -485,14 +485,14 @@ end gem 'spamcheck', '~> 0.1.0' # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 14.4.0.pre.rc43' +gem 'gitaly', '~> 14.6.0.pre.rc1' # KAS GRPC protocol definitions gem 'kas-grpc', '~> 0.0.2' -gem 'grpc', '~> 1.30.2' +gem 'grpc', '~> 1.42.0' -gem 'google-protobuf', '~> 3.17.1' +gem 'google-protobuf', '~> 3.19.0' gem 'toml-rb', '~> 2.0' diff --git a/Gemfile.lock b/Gemfile.lock index 238228f13fc3afa163fafd95221fcdcd3961aafa..2a54b7aaaec96bd37f8fe6f1cc8a73b612f47ccb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -452,7 +452,7 @@ GEM rails (>= 3.2.0) git (1.7.0) rchardet (~> 1.8) - gitaly (14.4.0.pre.rc43) + gitaly (14.6.0.pre.rc1) grpc (~> 1.0) github-markup (1.7.0) gitlab (4.16.1) @@ -474,10 +474,10 @@ GEM fog-json (~> 1.2.0) mime-types ms_rest_azure (~> 0.12.0) - gitlab-labkit (0.21.1) + gitlab-labkit (0.21.3) actionpack (>= 5.0.0, < 7.0.0) activesupport (>= 5.0.0, < 7.0.0) - grpc (~> 1.30.2) + grpc (>= 1.37) jaeger-client (~> 1.1) opentracing (~> 0.4) pg_query (~> 2.1) @@ -531,8 +531,8 @@ GEM signet (~> 0.12) google-cloud-env (1.5.0) faraday (>= 0.17.3, < 2.0) - google-protobuf (3.17.3) - googleapis-common-protos-types (1.1.0) + google-protobuf (3.19.1) + googleapis-common-protos-types (1.3.0) google-protobuf (~> 3.14) googleauth (0.14.0) faraday (>= 0.17.3, < 2.0) @@ -580,8 +580,8 @@ GEM graphql (~> 1.6) html-pipeline (~> 2.8) sass (~> 3.4) - grpc (1.30.2) - google-protobuf (~> 3.12) + grpc (1.42.0) + google-protobuf (~> 3.18) googleapis-common-protos-types (~> 1.0) gssapi (1.2.0) ffi (>= 1.0.1) @@ -1473,13 +1473,13 @@ DEPENDENCIES gettext (~> 3.3) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 14.4.0.pre.rc43) + gitaly (~> 14.6.0.pre.rc1) github-markup (~> 1.7.0) gitlab-chronic (~> 0.10.5) gitlab-dangerfiles (~> 2.6.1) gitlab-experiment (~> 0.6.5) gitlab-fog-azure-rm (~> 1.2.0) - gitlab-labkit (~> 0.21.1) + gitlab-labkit (~> 0.21.3) gitlab-license (~> 2.0) gitlab-license_finder (~> 6.0) gitlab-mail_room (~> 0.0.9) @@ -1492,7 +1492,7 @@ DEPENDENCIES gitlab_omniauth-ldap (~> 2.1.1) gon (~> 6.4.0) google-api-client (~> 0.33) - google-protobuf (~> 3.17.1) + google-protobuf (~> 3.19.0) gpgme (~> 2.0.19) grape (~> 1.5.2) grape-entity (~> 0.10.0) @@ -1502,7 +1502,7 @@ DEPENDENCIES graphlient (~> 0.4.0) graphql (~> 1.11.10) graphql-docs (~> 1.6.0) - grpc (~> 1.30.2) + grpc (~> 1.42.0) gssapi guard-rspec haml_lint (~> 0.36.0)