Fix MR conflict resolution commits

97ceadee · Sean McGivern · Fatih Acet · 7af277f6 · 97ceadee
Commit 97ceadee authored Jul 29, 2016 by Sean McGivern Committed by Fatih Acet Aug 12, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

lib/gitlab/conflict/file_collection.rb lib/gitlab/conflict/file_collection.rb +1 -1

No files found.
--- a/lib/gitlab/conflict/file_collection.rb
+++ b/lib/gitlab/conflict/file_collection.rb
@@ -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