diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-07-29 16:49:48 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-08-12 23:24:44 +0300 |
| commit | 97ceadeea7b3ad9fa69049932149157334beba11 (patch) | |
| tree | 1600fae2596aa4461b44f0c39081a54eb8e264d0 /lib/gitlab/conflict | |
| parent | 7af277f683cd5ee0d5e3ffbc1dd3ce1d61f17848 (diff) | |
Fix MR conflict resolution commits
Diffstat (limited to 'lib/gitlab/conflict')
| -rw-r--r-- | lib/gitlab/conflict/file_collection.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/conflict/file_collection.rb b/lib/gitlab/conflict/file_collection.rb index 695dafa9e20..46e381d2661 100644 --- 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 |