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 /spec/models | |
| 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 'spec/models')
| -rw-r--r-- | spec/models/repository_spec.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb index 13da7bd7407..3d967aa4ab8 100644 --- a/spec/models/repository_spec.rb +++ b/spec/models/repository_spec.rb @@ -1420,12 +1420,13 @@ describe Repository do source_project: project) end - it 'writes merge of source and target to MR merge_ref_path' do + it 'writes merge of source SHA and first parent ref to MR merge_ref_path' do merge_commit_id = repository.merge_to_ref(user, merge_request.diff_head_sha, merge_request, merge_request.merge_ref_path, - 'Custom message') + 'Custom message', + merge_request.target_branch_ref) merge_commit = repository.commit(merge_commit_id) |