Commit 0b3df0df authored by Phil Hughes's avatar Phil Hughes Committed by Kushal Pandya

Fixed diff commit comments not appearing

Closes https://gitlab.com/gitlab-org/gitlab/-/issues/227161
parent 9210aaf0
...@@ -159,7 +159,12 @@ export default { ...@@ -159,7 +159,12 @@ export default {
[types.SET_LINE_DISCUSSIONS_FOR_FILE](state, { discussion, diffPositionByLineCode, hash }) { [types.SET_LINE_DISCUSSIONS_FOR_FILE](state, { discussion, diffPositionByLineCode, hash }) {
const { latestDiff } = state; const { latestDiff } = state;
const discussionLineCodes = [discussion.line_code, ...(discussion.line_codes || [])]; const originalStartLineCode = discussion.original_position?.line_range?.start?.line_code;
const discussionLineCodes = [
discussion.line_code,
originalStartLineCode,
...(discussion.line_codes || []),
];
const fileHash = discussion.diff_file.file_hash; const fileHash = discussion.diff_file.file_hash;
const lineCheck = (line) => const lineCheck = (line) =>
discussionLineCodes.some( discussionLineCodes.some(
......
---
title: Fixed discussions on merge request commits not showing
merge_request: 53143
author:
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment