Merge branch '28367-fix-unfold-diff-line-number-copy-paste' into 'master'
fixes line number copy issue for unfolded parallel view diff Closes #28367 See merge request !9365
This commit is contained in:
commit
d6f18f8e19
2 changed files with 6 additions and 2 deletions
|
@ -19,10 +19,10 @@
|
|||
= line_content
|
||||
- when :parallel
|
||||
%td.old_line.diff-line-num{ data: { linenumber: line_old } }
|
||||
= link_to raw(line_old), "##{line_old}"
|
||||
%a{ href: "##{line_old}", data: { linenumber: line_old } }
|
||||
= line_content
|
||||
%td.new_line.diff-line-num{ data: { linenumber: line_new } }
|
||||
= link_to raw(line_new), "##{line_new}"
|
||||
%a{ href: "##{line_new}", data: { linenumber: line_new } }
|
||||
= line_content
|
||||
|
||||
- if @form.unfold? && @form.bottom? && @form.to < @blob.lines.size
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
title: Fixes includes line number during unfold copy n paste in parallel diff view
|
||||
merge_request: 9365
|
||||
author:
|
Loading…
Reference in a new issue