Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
16d17b78
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
16d17b78
编写于
1月 22, 2016
作者:
D
Douwe Maan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Restore diff comments
上级
3f7993b5
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
7 addition
and
5 deletion
+7
-5
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
未找到文件。
app/views/projects/diffs/_text_file.html.haml
浏览文件 @
16d17b78
...
...
@@ -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
浏览文件 @
16d17b78
...
...
@@ -12,9 +12,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
)
...
...
@@ -23,9 +24,9 @@ module Gitlab
end
diff_line
.
text
=
rich_line
.
html_safe
end
@diff_lines
diff_line
end
end
private
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录