VladPolskiy/gitlab-foss
1
0
Fork 0
mirror of https://gitlab.com/gitlab-org/gitlab-foss.git synced 2025-07-29 12:00:32 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Fix MR conflict resolution commits

Browse Source
This commit is contained in:
Sean McGivern
2016-07-29 14:49:48 +01:00
committed by Fatih Acet
parent 7af277f683
commit 97ceadeea7
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/gitlab/conflict/file_collection.rb
View File

@ -33,7 +33,7 @@ module Gitlab
committer: committer,
tree: new_tree,
message: commit_message,
parents: [our_commit, their_commit],
parents: [our_commit, their_commit].map(&:oid),
update_ref: Gitlab::Git::BRANCH_REF_PREFIX + merge_request.source_branch)
end