Commit d6cb333c authored by Phil Hughes's avatar Phil Hughes

Fixes diff line content getting cached on the frontend

Removes the memoize call for the diff line conent
which can sometimes result in incorrect diff line conent
being displayed when navigating by commit.
parent ef0f0d7e
......@@ -140,16 +140,13 @@ export default {
},
(line) => line.type,
),
lineContent: memoize(
(line) => {
lineContent: (line) => {
if (line.isConflictMarker) {
return line.type === CONFLICT_MARKER_THEIR ? 'HEAD//our changes' : 'origin//their changes';
}
return line.rich_text;
},
(line) => line.line_code,
),
CONFLICT_MARKER,
CONFLICT_MARKER_THEIR,
CONFLICT_OUR,
......
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