Merge branch '26829-diff-unfolding-links-erroneously-present-on-no-newline-lines' into 'master'

Prevent "nonewline" type diff lines from showing a diff unfolding link

Closes #26829

See merge request !8632

app/views/projects/diffs/_parallel_view.html.haml

@@ -8,8 +8,12 @@
       - last_line = right.new_pos if right
       %tr.line_holder.parallel
         - if left
-          - if left.meta?
+          - case left.type
+          - when 'match'
             = diff_match_line left.old_pos, nil, text: left.text, view: :parallel
+          - when 'nonewline'
+            %td.old_line.diff-line-num
+            %td.line_content.match= left.text
           - else
             - left_line_code = diff_file.line_code(left)
             - left_position = diff_file.position(left)
@@ -21,8 +25,12 @@
           %td.line_content.parallel
         - if right
-          - if right.meta?
+          - case right.type
+          - when 'match'
             = diff_match_line nil, right.new_pos, text: left.text, view: :parallel
+          - when 'nonewline'
+            %td.new_line.diff-line-num
+            %td.line_content.match= right.text
           - else
             - right_line_code = diff_file.line_code(right)
             - right_position = diff_file.position(right)