summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2019-06-20 19:45:46 +0700
committerShinya Maeda <shinya@gitlab.com>2019-07-05 17:15:10 +0700
commit48307fac1ec7cd207fbd53762fd1226a9d6fb1a2 (patch)
tree92b3d9b65dd6e541dd09acda541e5c291448fb09 /Gemfile
parent9414a41f8390511005702ab4fec99239b6c3c6dd (diff)
downloadgitlab-ce-48307fac1ec7cd207fbd53762fd1226a9d6fb1a2.tar.gz
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.
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
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'