summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/diffs/components/diff_row.vue
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-06-18 18:10:13 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-06-18 18:10:13 +0000
commitdd6e32bf47776514b8fe2abcfe7998503f16baab (patch)
treef47d5c93958146fcfc6dd0dba3a6e11a2f8061ab /app/assets/javascripts/diffs/components/diff_row.vue
parentc8cc2fe990c52cabcb9912b2b01b5bf16b33d88f (diff)
downloadgitlab-ce-dd6e32bf47776514b8fe2abcfe7998503f16baab.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/diffs/components/diff_row.vue')
-rw-r--r--app/assets/javascripts/diffs/components/diff_row.vue4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/diffs/components/diff_row.vue b/app/assets/javascripts/diffs/components/diff_row.vue
index 37dd7941b2e..c595aac3a8b 100644
--- a/app/assets/javascripts/diffs/components/diff_row.vue
+++ b/app/assets/javascripts/diffs/components/diff_row.vue
@@ -210,6 +210,7 @@ export default {
<template>
<div :class="classNameMap" class="diff-grid-row diff-tr line_holder">
<div
+ :id="line.left && line.left.line_code"
data-testid="left-side"
class="diff-grid-left left-side"
v-bind="interopLeftAttributes"
@@ -293,7 +294,6 @@ export default {
/>
</div>
<div
- :id="line.left.line_code"
:key="line.left.line_code"
:class="[parallelViewLeftLineType, { parallel: !inline }]"
class="diff-td line_content with-coverage left-side"
@@ -334,6 +334,7 @@ export default {
</div>
<div
v-if="!inline"
+ :id="line.right && line.right.line_code"
data-testid="right-side"
class="diff-grid-right right-side"
v-bind="interopRightAttributes"
@@ -409,7 +410,6 @@ export default {
/>
</div>
<div
- :id="line.right.line_code"
:key="line.right.rich_text"
:class="[
line.right.type,