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 15:17:23 +0700
commitf6ea904a1cb99410fb99e59de769e7f062e1c4f6 (patch)
tree6d232bd534e35e54bcc6540c0a08a9f4dbc4cb99 /Gemfile
parent9414a41f8390511005702ab4fec99239b6c3c6dd (diff)
downloadgitlab-ce-f6ea904a1cb99410fb99e59de769e7f062e1c4f6.tar.gz
Extend MergeToRefService for creating merge ref from the other refcreate-merge-train-ref-ce
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'