Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
bc0a8233
Commit
bc0a8233
authored
Jan 18, 2017
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ensure last line in diff block is contained within a table row element
parent
e2f0b830
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
app/views/projects/diffs/_parallel_view.html.haml
app/views/projects/diffs/_parallel_view.html.haml
+2
-1
app/views/projects/diffs/_text_file.html.haml
app/views/projects/diffs/_text_file.html.haml
+2
-1
No files found.
app/views/projects/diffs/_parallel_view.html.haml
View file @
bc0a8233
...
...
@@ -38,4 +38,5 @@
-
if
discussion_left
||
discussion_right
=
render
"discussions/parallel_diff_discussion"
,
discussion_left:
discussion_left
,
discussion_right:
discussion_right
-
if
!
diff_file
.
new_file
&&
last_line
>
0
=
diff_match_line
last_line
,
last_line
,
bottom:
true
,
view: :parallel
%tr
.line_holder.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 @@
-
last_line
=
diff_file
.
highlighted_diff_lines
.
last
.
new_pos
-
if
!
diff_file
.
new_file
&&
last_line
>
0
=
diff_match_line
last_line
,
last_line
,
bottom:
true
%tr
.line_holder
=
diff_match_line
last_line
,
last_line
,
bottom:
true
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment