Skip to content

G
gitlab-ce
Commit bc0a8233 authored by Mike Greiling's avatar Mike Greiling
Browse files
Options

ensure last line in diff block is contained within a table row element

parent e2f0b830
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
app/views/projects/diffs/_parallel_view.html.haml
View file @ bc0a8233
...@@ -38,4 +38,5 @@ ...@@ -38,4 +38,5 @@
- if discussion_left || discussion_right - if discussion_left || discussion_right
= render "discussions/parallel_diff_discussion", discussion_left: discussion_left, discussion_right: discussion_right = render "discussions/parallel_diff_discussion", discussion_left: discussion_left, discussion_right: discussion_right
- if !diff_file.new_file && last_line > 0 - if !diff_file.new_file && last_line > 0
%tr.line_holder.parallel
= diff_match_line last_line, last_line, bottom: true, view: :parallel = diff_match_line last_line, last_line, bottom: true, view: :parallel
app/views/projects/diffs/_text_file.html.haml
View file @ bc0a8233
...@@ -13,4 +13,5 @@ ...@@ -13,4 +13,5 @@
- last_line = diff_file.highlighted_diff_lines.last.new_pos - last_line = diff_file.highlighted_diff_lines.last.new_pos
- if !diff_file.new_file && last_line > 0 - if !diff_file.new_file && last_line > 0
%tr.line_holder
= diff_match_line last_line, last_line, bottom: true = diff_match_line last_line, last_line, bottom: true
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7