diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-07-29 11:05:33 +0100 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-08-12 23:24:43 +0300 |
| commit | 28ef06c52b3d76b2e5dc60b0bdcf407162035ee8 (patch) | |
| tree | 155d6e9264279461a8d5843c2201f70af2efb781 /lib/gitlab/conflict | |
| parent | 10321bf862135b946d50918e89bc4667e8d9071d (diff) | |
| download | gitlab-ce-28ef06c52b3d76b2e5dc60b0bdcf407162035ee8.tar.gz | |
Fix merge conflict reading for new diffs
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 a4a1505bb7d..695dafa9e20 100644 --- a/lib/gitlab/conflict/file_collection.rb +++ b/lib/gitlab/conflict/file_collection.rb @@ -5,7 +5,7 @@ module Gitlab def initialize(merge_request) @merge_request = merge_request - @our_commit = merge_request.diff_head_commit.raw.raw_commit + @our_commit = merge_request.source_branch_head.raw.raw_commit @their_commit = merge_request.target_branch_head.raw.raw_commit end |