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
205358b1
Commit
205358b1
authored
Sep 08, 2014
by
Marin Jankovski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleanup
parent
23706716
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
13 deletions
+6
-13
app/views/projects/commits/_parallel_view.html.haml
app/views/projects/commits/_parallel_view.html.haml
+6
-13
No files found.
app/views/projects/commits/_parallel_view.html.haml
View file @
205358b1
...
@@ -11,20 +11,13 @@
...
@@ -11,20 +11,13 @@
%tr
.line_holder.parallel
%tr
.line_holder.parallel
-
if
type_left
==
'match'
-
if
type_left
==
'match'
=
render
"projects/commits/diffs/match_line_parallel"
,
{
line:
line_content_left
,
=
render
"projects/commits/diffs/match_line_parallel"
,
{
line:
line_content_left
,
line_old:
line_number_left
,
line_new:
line_number_right
,
bottom:
false
}
line_old:
line_number_left
,
line_new:
line_number_right
}
-
elsif
type_left
==
'old'
-
elsif
type_left
==
'old'
||
type_left
.
nil?
%td
.old_line
{
class:
"old"
}
%td
.old_line
{
class:
"#{type_left}"
}
=
link_to
raw
(
line_number_left
)
=
link_to
raw
(
line_number_left
)
%td
.line_content
{
class:
"parallel noteable_line old"
}=
raw
line_content_left
%td
.line_content
{
class:
"parallel noteable_line #{type_left}"
}=
raw
line_content_left
%td
.new_line
{
class:
"#{type_right == 'new' ? 'new' : nil}"
,
data:
{
linenumber:
line_number_right
}}
%td
.new_line
{
class:
"#{type_right == 'new' ? 'new' : nil}"
,
data:
{
linenumber:
line_number_right
}}
=
link_to
raw
(
line_number_right
)
%td
.line_content.parallel
{
class:
"noteable_line #{type_right == 'new' ? 'new' : nil}"
}=
raw
line_content_right
-
elsif
type_left
.
nil?
%td
.old_line
=
link_to
raw
(
line_number_left
)
%td
.line_content
{
class:
"parallel noteable_line"
}=
raw
line_content_left
%td
.new_line
{
class:
"#{type_right == 'new' ? 'new' : nil}"
,
data:
{
linenumber:
line_number_right
}}
=
link_to
raw
(
line_number_right
)
=
link_to
raw
(
line_number_right
)
%td
.line_content.parallel
{
class:
"noteable_line #{type_right == 'new' ? 'new' : nil}"
}=
raw
line_content_right
%td
.line_content.parallel
{
class:
"noteable_line #{type_right == 'new' ? 'new' : nil}"
}=
raw
line_content_right
...
...
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