summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorLuke Duncalfe <lduncalfe@gitlab.com>2019-05-02 17:30:07 +0000
committerDouwe Maan <douwe@gitlab.com>2019-05-02 17:30:07 +0000
commit49cb4b3dfcb88403ca7c7e866d94a9fbb08be442 (patch)
tree4d25f584337bd357f137ded0927207fd8de6fae4 /Gemfile
parent4e67122e389708d766a2a90daa059f05b0f980c5 (diff)
downloadgitlab-ce-49cb4b3dfcb88403ca7c7e866d94a9fbb08be442.tar.gz
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
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
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'