diff options
| author | Phil Hughes <me@iamphill.com> | 2019-03-25 08:51:29 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-03-25 08:51:29 +0000 |
| commit | f773248dd29effa28f6658ea5151ba7fccf84ec3 (patch) | |
| tree | a10f93a9839048b623355492c32d40b7d875799f | |
| parent | 109de2a738841a64a4cc200b4f43070e2823868d (diff) | |
| parent | 106592115da43b2719c4daca32e30ab930814b40 (diff) | |
| download | gitlab-ce-f773248dd29effa28f6658ea5151ba7fccf84ec3.tar.gz | |
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
| -rw-r--r-- | app/assets/javascripts/diffs/components/parallel_diff_table_row.vue | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/48297-fix-code-selection.yml | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/app/assets/javascripts/diffs/components/parallel_diff_table_row.vue b/app/assets/javascripts/diffs/components/parallel_diff_table_row.vue index caf0df8a4e3..c60246bf8ef 100644 --- a/app/assets/javascripts/diffs/components/parallel_diff_table_row.vue +++ b/app/assets/javascripts/diffs/components/parallel_diff_table_row.vue @@ -140,7 +140,7 @@ export default { :id="line.left.line_code" :class="parallelViewLeftLineType" class="line_content parallel left-side" - @mousedown.native="handleParallelLineMouseDown" + @mousedown="handleParallelLineMouseDown" v-html="line.left.rich_text" ></td> </template> @@ -171,7 +171,7 @@ export default { }, ]" class="line_content parallel right-side" - @mousedown.native="handleParallelLineMouseDown" + @mousedown="handleParallelLineMouseDown" v-html="line.right.rich_text" ></td> </template> diff --git a/changelogs/unreleased/48297-fix-code-selection.yml b/changelogs/unreleased/48297-fix-code-selection.yml new file mode 100644 index 00000000000..14841b00969 --- /dev/null +++ b/changelogs/unreleased/48297-fix-code-selection.yml @@ -0,0 +1,6 @@ +--- +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 |