Commit d6f18f8e authored by Jacob Schatz's avatar Jacob Schatz

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
parents 983b90e4 c1714355
...@@ -19,10 +19,10 @@ ...@@ -19,10 +19,10 @@
= line_content = line_content
- when :parallel - when :parallel
%td.old_line.diff-line-num{ data: { linenumber: line_old } } %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 = line_content
%td.new_line.diff-line-num{ data: { linenumber: line_new } } %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 = line_content
- if @form.unfold? && @form.bottom? && @form.to < @blob.lines.size - if @form.unfold? && @form.bottom? && @form.to < @blob.lines.size
......
---
title: Fixes includes line number during unfold copy n paste in parallel diff view
merge_request: 9365
author:
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