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
Tatuya Kamada
gitlab-ce
Commits
13cfa49a
Commit
13cfa49a
authored
Sep 05, 2014
by
Marin Jankovski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Color the lines correctly.
parent
7d45624d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
8 deletions
+10
-8
app/views/projects/commits/_parallel_view.html.haml
app/views/projects/commits/_parallel_view.html.haml
+10
-8
No files found.
app/views/projects/commits/_parallel_view.html.haml
View file @
13cfa49a
...
...
@@ -8,8 +8,8 @@
line_old:
line_old
,
line_new:
line_new
,
bottom:
false
}
-
else
-
if
diff
.
new_file
%td
.old_line
{
class:
"old"
}
%td
.line_content.parallel
=
"
"
%td
.old_line
%td
.line_content.parallel
=
raw
"
"
-
else
-
next
if
type
==
'new'
%td
.old_line
{
class:
"#{type}"
}
...
...
@@ -19,18 +19,20 @@
-
else
%td
.line_content.parallel
=
raw
line
-
if
diff
.
deleted_file
%td
.new_line
{
class:
"new"
,
data:
{
linenumber:
line_new
}}
%td
.line_content.parallel
=
"
"
%td
.new_line
{
data:
{
linenumber:
line_new
}}
%td
.line_content.parallel
=
raw
"
"
-
else
%td
.new_line
{
class:
"#{type}"
,
data:
{
linenumber:
line_new
}}
-
if
type
==
'old'
%td
.new_line
{
class:
"#{next_type == 'new' ? 'new' : nil}"
,
data:
{
linenumber:
line_new
}}
-
if
next_type
==
'new'
-
content
=
next_line
=
link_to
raw
(
line_new
)
,
"#
#{
line_code
}
"
,
id:
line_code
%td
.line_content.parallel
{
class:
"noteable_line new #{line_code}"
,
"line_code"
=>
line_code
}=
raw
content
-
else
-
content
=
" "
%td
.line_content.parallel
{
class:
"noteable_line new
#{line_code}"
,
"line_code"
=>
line_code
}=
raw
content
%td
.line_content.parallel
{
class:
"noteable_line
#{line_code}"
,
"line_code"
=>
line_code
}=
raw
content
-
else
%td
.new_line
{
class:
"#{type}"
,
data:
{
linenumber:
line_new
}}
=
link_to
raw
(
line_new
)
,
"#
#{
line_code
}
"
,
id:
line_code
%td
.line_content.parallel
{
class:
"#{type}"
}=
raw
line
...
...
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