diff options
author | Shinya Maeda <shinya@gitlab.com> | 2019-06-20 19:45:46 +0700 |
---|---|---|
committer | Shinya Maeda <shinya@gitlab.com> | 2019-07-05 17:15:10 +0700 |
commit | 48307fac1ec7cd207fbd53762fd1226a9d6fb1a2 (patch) | |
tree | 92b3d9b65dd6e541dd09acda541e5c291448fb09 /Gemfile | |
parent | 9414a41f8390511005702ab4fec99239b6c3c6dd (diff) | |
download | gitlab-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-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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' |