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
Kazuhiko Shiozaki
gitlab-ce
Commits
2fed8bf3
Commit
2fed8bf3
authored
Jan 22, 2016
by
Robert Speicher
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix-diff-comments' into 'master'
More highlighted diff fixes See merge request !2545
parents
87867018
3db24ec9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
6 deletions
+10
-6
app/views/projects/diffs/_text_file.html.haml
app/views/projects/diffs/_text_file.html.haml
+2
-1
lib/gitlab/diff/highlight.rb
lib/gitlab/diff/highlight.rb
+5
-4
lib/gitlab/diff/parallel_diff.rb
lib/gitlab/diff/parallel_diff.rb
+3
-1
No files found.
app/views/projects/diffs/_text_file.html.haml
View file @
2fed8bf3
...
...
@@ -6,6 +6,7 @@
%table
.text-file.code.js-syntax-highlight
{
class:
too_big
?
'hide'
:
''
}
-
last_line
=
0
-
raw_diff_lines
=
diff_file
.
diff_lines
-
diff_file
.
highlighted_diff_lines
.
each_with_index
do
|
line
,
index
|
-
type
=
line
.
type
-
last_line
=
line
.
new_pos
...
...
@@ -31,7 +32,7 @@
-
if
@reply_allowed
-
comments
=
@line_notes
.
select
{
|
n
|
n
.
line_code
==
line_code
&&
n
.
active?
}.
sort_by
(
&
:created_at
)
-
unless
comments
.
empty?
=
render
"projects/notes/diff_notes_with_reply"
,
notes:
comments
,
line:
line
.
text
=
render
"projects/notes/diff_notes_with_reply"
,
notes:
comments
,
line:
raw_diff_lines
[
index
]
.
text
-
if
last_line
>
0
=
render
"projects/diffs/match_line"
,
{
line:
""
,
...
...
lib/gitlab/diff/highlight.rb
View file @
2fed8bf3
...
...
@@ -16,9 +16,10 @@ module Gitlab
end
def
highlight
@diff_lines
.
each_with_index
do
|
diff_line
,
i
|
@diff_lines
.
map
.
with_index
do
|
diff_line
,
i
|
diff_line
=
diff_line
.
dup
# ignore highlighting for "match" lines
next
if
diff_line
.
type
==
'match'
||
diff_line
.
type
==
'nonewline'
next
diff_line
if
diff_line
.
type
==
'match'
||
diff_line
.
type
==
'nonewline'
rich_line
=
highlight_line
(
diff_line
,
i
)
...
...
@@ -27,9 +28,9 @@ module Gitlab
end
diff_line
.
text
=
rich_line
.
html_safe
end
@diff_lines
diff_line
end
end
private
...
...
lib/gitlab/diff/parallel_diff.rb
View file @
2fed8bf3
...
...
@@ -11,7 +11,8 @@ module Gitlab
lines
=
[]
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
type
=
line
.
type
line_code
=
generate_line_code
(
diff_file
.
file_path
,
line
)
...
...
@@ -21,6 +22,7 @@ module Gitlab
next_line
=
diff_file
.
next_line
(
line
.
index
)
if
next_line
next_line
=
highlighted_diff_lines
[
next_line
.
index
]
next_line_code
=
generate_line_code
(
diff_file
.
file_path
,
next_line
)
next_type
=
next_line
.
type
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