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
Léo-Paul Géneau
gitlab-ce
Commits
1dfbce20
Commit
1dfbce20
authored
12 years ago
by
Valeriy Sizov
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2148 from jojosch/fix-2147
commit diff - check if prev_commit is not nil
parents
e9212b0a
0323610b
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
app/views/commits/_diffs.html.haml
app/views/commits/_diffs.html.haml
+1
-1
No files found.
app/views/commits/_diffs.html.haml
View file @
1dfbce20
...
@@ -43,7 +43,7 @@
...
@@ -43,7 +43,7 @@
-
if
file
.
text?
-
if
file
.
text?
=
render
"commits/text_file"
,
diff:
diff
,
index:
i
=
render
"commits/text_file"
,
diff:
diff
,
index:
i
-
elsif
file
.
image?
-
elsif
file
.
image?
-
old_file
=
(
@commit
.
prev_commit
.
tree
/
diff
.
old_path
)
-
old_file
=
(
@commit
.
prev_commit
.
tree
/
diff
.
old_path
)
if
!
@commit
.
prev_commit
.
nil?
-
if
diff
.
renamed_file
||
diff
.
new_file
||
diff
.
deleted_file
-
if
diff
.
renamed_file
||
diff
.
new_file
||
diff
.
deleted_file
.diff_file_content_image
.diff_file_content_image
.image
{
class:
image_diff_class
(
diff
)}
.image
{
class:
image_diff_class
(
diff
)}
...
...
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