Commit f773248d authored by Phil Hughes's avatar Phil Hughes

Merge branch '48297-fix-code-selection' into 'master'

Resolve "Code in other column of side-by-side diff is highlighted when selecting code on one side"

Closes #48297

See merge request gitlab-org/gitlab-ce!26423
parents 109de2a7 10659211
...@@ -140,7 +140,7 @@ export default { ...@@ -140,7 +140,7 @@ export default {
:id="line.left.line_code" :id="line.left.line_code"
:class="parallelViewLeftLineType" :class="parallelViewLeftLineType"
class="line_content parallel left-side" class="line_content parallel left-side"
@mousedown.native="handleParallelLineMouseDown" @mousedown="handleParallelLineMouseDown"
v-html="line.left.rich_text" v-html="line.left.rich_text"
></td> ></td>
</template> </template>
...@@ -171,7 +171,7 @@ export default { ...@@ -171,7 +171,7 @@ export default {
}, },
]" ]"
class="line_content parallel right-side" class="line_content parallel right-side"
@mousedown.native="handleParallelLineMouseDown" @mousedown="handleParallelLineMouseDown"
v-html="line.right.rich_text" v-html="line.right.rich_text"
></td> ></td>
</template> </template>
......
---
title: Resolve Code in other column of side-by-side diff is highlighted when selecting
code on one side
merge_request: 26423
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