diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
| commit | 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (patch) | |
| tree | 78be5963ec075d80116a932011d695dd33910b4e /app/services/discussions/capture_diff_note_position_service.rb | |
| parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) | |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'app/services/discussions/capture_diff_note_position_service.rb')
| -rw-r--r-- | app/services/discussions/capture_diff_note_position_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/discussions/capture_diff_note_position_service.rb b/app/services/discussions/capture_diff_note_position_service.rb index 8f12470d9e8..4e8fd90a2e7 100644 --- a/app/services/discussions/capture_diff_note_position_service.rb +++ b/app/services/discussions/capture_diff_note_position_service.rb @@ -50,9 +50,9 @@ module Discussions merge_ref_head = merge_request.merge_ref_head return unless merge_ref_head - start_sha, base_sha = merge_ref_head.parent_ids + start_sha, _ = merge_ref_head.parent_ids new_diff_refs = Gitlab::Diff::DiffRefs.new( - base_sha: base_sha, + base_sha: start_sha, start_sha: start_sha, head_sha: merge_ref_head.id) |