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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
2d0c0308
Commit
2d0c0308
authored
8 years ago
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
prevent diff unfolding link from appearing for deleted files
parent
3b67af69
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/views/projects/diffs/_parallel_view.html.haml
app/views/projects/diffs/_parallel_view.html.haml
+1
-1
app/views/projects/diffs/_text_file.html.haml
app/views/projects/diffs/_text_file.html.haml
+1
-1
No files found.
app/views/projects/diffs/_parallel_view.html.haml
View file @
2d0c0308
...
...
@@ -43,7 +43,7 @@
-
discussion_left
,
discussion_right
=
parallel_diff_discussions
(
left
,
right
,
diff_file
)
-
if
discussion_left
||
discussion_right
=
render
"discussions/parallel_diff_discussion"
,
discussion_left:
discussion_left
,
discussion_right:
discussion_right
-
if
!
diff_file
.
new_file
&&
diff_file
.
diff_lines
.
any?
-
if
!
diff_file
.
new_file
&&
!
diff_file
.
deleted_file
&&
diff_file
.
diff_lines
.
any?
-
last_line
=
diff_file
.
diff_lines
.
last
-
if
last_line
.
new_pos
<
total_lines
%tr
.line_holder.parallel
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/diffs/_text_file.html.haml
View file @
2d0c0308
...
...
@@ -10,7 +10,7 @@
as: :line
,
locals:
{
diff_file:
diff_file
,
discussions:
discussions
}
-
if
!
diff_file
.
new_file
&&
diff_file
.
highlighted_diff_lines
.
any?
-
if
!
diff_file
.
new_file
&&
!
diff_file
.
deleted_file
&&
diff_file
.
highlighted_diff_lines
.
any?
-
last_line
=
diff_file
.
highlighted_diff_lines
.
last
-
if
last_line
.
new_pos
<
total_lines
%tr
.line_holder
...
...
This diff is collapsed.
Click to expand it.
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