diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 10:00:54 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 10:00:54 +0000 |
| commit | 3cccd102ba543e02725d247893729e5c73b38295 (patch) | |
| tree | f36a04ec38517f5deaaacb5acc7d949688d1e187 /app/views/projects/diffs/_parallel_view.html.haml | |
| parent | 205943281328046ef7b4528031b90fbda70c75ac (diff) | |
| download | gitlab-ce-3cccd102ba543e02725d247893729e5c73b38295.tar.gz | |
Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42
Diffstat (limited to 'app/views/projects/diffs/_parallel_view.html.haml')
| -rw-r--r-- | app/views/projects/diffs/_parallel_view.html.haml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/views/projects/diffs/_parallel_view.html.haml b/app/views/projects/diffs/_parallel_view.html.haml index ebe3aad064a..03fe3e6edf5 100644 --- a/app/views/projects/diffs/_parallel_view.html.haml +++ b/app/views/projects/diffs/_parallel_view.html.haml @@ -11,6 +11,8 @@ - case left.type - when 'match' = diff_match_line left.old_pos, nil, text: left.text, view: :parallel + - when 'old-nomappinginraw', 'new-nomappinginraw', 'unchanged-nomappinginraw' + = diff_nomappinginraw_line left, %w[old_line diff-line-num], nil, %w[line_content parallel left-side] - when 'old-nonewline', 'new-nonewline' %td.old_line.diff-line-num %td.line_content.match.left-side= left.text @@ -29,6 +31,8 @@ - case right.type - when 'match' = diff_match_line nil, right.new_pos, text: left.text, view: :parallel + - when 'old-nomappinginraw', 'new-nomappinginraw', 'unchanged-nomappinginraw' + = diff_nomappinginraw_line right, %w[new_line diff-line-num], nil, %w[line_content parallel right-side] - when 'old-nonewline', 'new-nonewline' %td.new_line.diff-line-num %td.line_content.match.right-side= right.text |