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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
3db24ec9
Commit
3db24ec9
authored
Jan 22, 2016
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Properly highlight right side of parallel diff
parent
16d17b78
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletion
+3
-1
lib/gitlab/diff/parallel_diff.rb
lib/gitlab/diff/parallel_diff.rb
+3
-1
No files found.
lib/gitlab/diff/parallel_diff.rb
View file @
3db24ec9
...
@@ -11,7 +11,8 @@ module Gitlab
...
@@ -11,7 +11,8 @@ module Gitlab
lines
=
[]
lines
=
[]
skip_next
=
false
skip_next
=
false
diff_file
.
highlighted_diff_lines
.
each
do
|
line
|
highlighted_diff_lines
=
diff_file
.
highlighted_diff_lines
highlighted_diff_lines
.
each
do
|
line
|
full_line
=
line
.
text
full_line
=
line
.
text
type
=
line
.
type
type
=
line
.
type
line_code
=
generate_line_code
(
diff_file
.
file_path
,
line
)
line_code
=
generate_line_code
(
diff_file
.
file_path
,
line
)
...
@@ -21,6 +22,7 @@ module Gitlab
...
@@ -21,6 +22,7 @@ module Gitlab
next_line
=
diff_file
.
next_line
(
line
.
index
)
next_line
=
diff_file
.
next_line
(
line
.
index
)
if
next_line
if
next_line
next_line
=
highlighted_diff_lines
[
next_line
.
index
]
next_line_code
=
generate_line_code
(
diff_file
.
file_path
,
next_line
)
next_line_code
=
generate_line_code
(
diff_file
.
file_path
,
next_line
)
next_type
=
next_line
.
type
next_type
=
next_line
.
type
next_line
=
next_line
.
text
next_line
=
next_line
.
text
...
...
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