From 49cb4b3dfcb88403ca7c7e866d94a9fbb08be442 Mon Sep 17 00:00:00 2001 From: Luke Duncalfe Date: Thu, 2 May 2019 17:30:07 +0000 Subject: Add support for two-step Gitaly Rebase RPC The new two-step Gitaly `Rebase` RPC yields the rebase commit SHA to the client before proceeding with the rebase. This avoids an issue where the rebase commit SHA was returned when the RPC had fully completed, and in some cases this would be after the Rails `post_receive` worker services had already run. In these situations, the merge request did not yet have its rebase_commit_sha attribute set introducing the possibility for bugs (such as previous approvals being reset). https://gitlab.com/gitlab-org/gitlab-ee/issues/5966 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index f3c21c720e0..ae9a29370c7 100644 --- a/Gemfile +++ b/Gemfile @@ -417,7 +417,7 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 1.26.0', require: 'gitaly' +gem 'gitaly-proto', '~> 1.27.0', require: 'gitaly' gem 'grpc', '~> 1.19.0' -- cgit v1.2.3