From 48307fac1ec7cd207fbd53762fd1226a9d6fb1a2 Mon Sep 17 00:00:00 2001 From: Shinya Maeda Date: Thu, 20 Jun 2019 19:45:46 +0700 Subject: Extend MergeToRefService for creating merge ref from the other ref Currently, MergeToRefService is specifically designed for createing merge commits from source branch and target branch of merge reqeusts. We extend this behavior to source branch and any target ref paths. --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 1264d75eac6..b1750afec91 100644 --- a/Gemfile +++ b/Gemfile @@ -429,7 +429,7 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 1.32.0', require: 'gitaly' +gem 'gitaly-proto', '~> 1.36.0', require: 'gitaly' gem 'grpc', '~> 1.19.0' -- cgit v1.2.1