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 /lib/gitlab/git/repository.rb | |
| 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 'lib/gitlab/git/repository.rb')
| -rw-r--r-- | lib/gitlab/git/repository.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index 19b6aab1c4f..060a29be782 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -536,9 +536,9 @@ module Gitlab tags.find { |tag| tag.name == name } end - def merge_to_ref(user, source_sha, branch, target_ref, message) + def merge_to_ref(user, source_sha, branch, target_ref, message, first_parent_ref) wrapped_gitaly_errors do - gitaly_operation_client.user_merge_to_ref(user, source_sha, branch, target_ref, message) + gitaly_operation_client.user_merge_to_ref(user, source_sha, branch, target_ref, message, first_parent_ref) end end |