diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-15 18:07:42 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-15 18:07:42 +0300 |
| commit | fa7c331b76ed59230cc56fc51bfc9e467c8bb9b4 (patch) | |
| tree | eb03d2b6e8dd45f67864635c8b0b0de8d671edf7 /app/services/design_management | |
| parent | f26f31d2fd8e3c91677e2629293b9e0562c1437a (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/design_management')
| -rw-r--r-- | app/services/design_management/copy_design_collection/copy_service.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/services/design_management/copy_design_collection/copy_service.rb b/app/services/design_management/copy_design_collection/copy_service.rb index 3bc30f62a81..8074a193bbf 100644 --- a/app/services/design_management/copy_design_collection/copy_service.rb +++ b/app/services/design_management/copy_design_collection/copy_service.rb @@ -128,9 +128,9 @@ module DesignManagement target_repository.raw.merge( git_user, - source_sha, - merge_branch, - 'CopyDesignCollectionService finalize merge' + source_sha: source_sha, + target_branch: merge_branch, + message: 'CopyDesignCollectionService finalize merge' ) { nil } target_design_collection.end_copy! |