diff options
| author | Alejandro RodrÃguez <alejorro70@gmail.com> | 2017-07-25 17:33:06 -0400 |
|---|---|---|
| committer | Alejandro RodrÃguez <alejorro70@gmail.com> | 2017-08-07 23:33:43 -0400 |
| commit | 3ce6f03f1437633c9328dc30aa5272a49368655b (patch) | |
| tree | 9f5080605369b4693a9540e9f73a43864259707d /lib/gitlab/conflict | |
| parent | e363fbf71a7874de2352740b3f33350e5ec4cf54 (diff) | |
| download | gitlab-ce-3ce6f03f1437633c9328dc30aa5272a49368655b.tar.gz | |
Incorporate Gitaly's CommitService.FindCommit RPCgitaly-find-commit
Diffstat (limited to 'lib/gitlab/conflict')
| -rw-r--r-- | lib/gitlab/conflict/file_collection.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/conflict/file_collection.rb b/lib/gitlab/conflict/file_collection.rb index 1611eba31da..d671867e7c7 100644 --- a/lib/gitlab/conflict/file_collection.rb +++ b/lib/gitlab/conflict/file_collection.rb @@ -77,8 +77,8 @@ EOM def initialize(merge_request, project) @merge_request = merge_request - @our_commit = merge_request.source_branch_head.raw.raw_commit - @their_commit = merge_request.target_branch_head.raw.raw_commit + @our_commit = merge_request.source_branch_head.raw.rugged_commit + @their_commit = merge_request.target_branch_head.raw.rugged_commit @project = project end end |