Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
ec82cecf
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,发现更多精彩内容 >>
提交
ec82cecf
编写于
9月 29, 2016
作者:
M
Matthew Dodds
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add link to comparison from system note, update changelog
上级
ce0591df
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
32 addition
and
4 deletion
+32
-4
CHANGELOG
CHANGELOG
+1
-0
app/services/system_note_service.rb
app/services/system_note_service.rb
+14
-1
spec/services/system_note_service_spec.rb
spec/services/system_note_service_spec.rb
+17
-3
未找到文件。
CHANGELOG
浏览文件 @
ec82cecf
Please view this file on the master branch, on stable branches it's out of date.
v 8.13.0 (unreleased)
- Add link from system note to compare with previous version
- Use gitlab-shell v3.6.2 (GIT TRACE logging)
- AbstractReferenceFilter caches project_refs on RequestStore when active
- Speed-up group milestones show page
...
...
app/services/system_note_service.rb
浏览文件 @
ec82cecf
...
...
@@ -21,7 +21,8 @@ module SystemNoteService
total_count
=
new_commits
.
length
+
existing_commits
.
length
commits_text
=
"
#{
total_count
}
commit"
.
pluralize
(
total_count
)
body
=
"Added
#{
commits_text
}
:
\n\n
"
body
=
"[Compare with previous version](
#{
diff_comparison_url
(
noteable
,
project
,
oldrev
)
}
)
\n\n
"
body
<<
"Added
#{
commits_text
}
:
\n\n
"
body
<<
existing_commit_summary
(
noteable
,
existing_commits
,
oldrev
)
body
<<
new_commit_summary
(
new_commits
).
join
(
"
\n
"
)
...
...
@@ -466,4 +467,16 @@ module SystemNoteService
def
escape_html
(
text
)
Rack
::
Utils
.
escape_html
(
text
)
end
def
diff_comparison_url
(
merge_request
,
project
,
oldrev
)
diff_id
=
merge_request
.
merge_request_diff
.
id
Gitlab
::
Routing
.
url_helpers
.
diffs_namespace_project_merge_request_url
(
project
.
namespace
,
project
,
merge_request
.
iid
,
diff_id:
diff_id
,
start_sha:
oldrev
)
end
end
spec/services/system_note_service_spec.rb
浏览文件 @
ec82cecf
...
...
@@ -40,21 +40,35 @@ describe SystemNoteService, services: true do
describe
'note body'
do
let
(
:note_lines
)
{
subject
.
note
.
split
(
"
\n
"
).
reject
(
&
:blank?
)
}
describe
'comparison diff link line'
do
it
'adds the comparison link'
do
link
=
Gitlab
::
Routing
.
url_helpers
.
diffs_namespace_project_merge_request_url
(
project
.
namespace
,
project
,
noteable
.
iid
,
diff_id:
noteable
.
merge_request_diff
.
id
,
start_sha:
oldrev
)
expect
(
note_lines
[
0
]).
to
eq
"[Compare with previous version](
#{
link
}
)"
end
end
context
'without existing commits'
do
it
'adds a message header'
do
expect
(
note_lines
[
0
]).
to
eq
"Added
#{
new_commits
.
size
}
commits:"
expect
(
note_lines
[
1
]).
to
eq
"Added
#{
new_commits
.
size
}
commits:"
end
it
'adds a message line for each commit'
do
new_commits
.
each_with_index
do
|
commit
,
i
|
# Skip the header
expect
(
note_lines
[
i
+
1
]).
to
eq
"*
#{
commit
.
short_id
}
-
#{
commit
.
title
}
"
expect
(
note_lines
[
i
+
2
]).
to
eq
"*
#{
commit
.
short_id
}
-
#{
commit
.
title
}
"
end
end
end
describe
'summary line for existing commits'
do
let
(
:summary_line
)
{
note_lines
[
1
]
}
let
(
:summary_line
)
{
note_lines
[
2
]
}
context
'with one existing commit'
do
let
(
:old_commits
)
{
[
noteable
.
commits
.
last
]
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录