Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
cb877b7e
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,发现更多精彩内容 >>
提交
cb877b7e
编写于
7月 22, 2013
作者:
J
Javier Castro
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix notifications to handle participants and mentions on commits too
上级
707cea8d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
12 addition
and
9 deletion
+12
-9
app/services/notification_service.rb
app/services/notification_service.rb
+7
-7
spec/services/notification_service_spec.rb
spec/services/notification_service_spec.rb
+5
-2
未找到文件。
app/services/notification_service.rb
浏览文件 @
cb877b7e
...
...
@@ -106,15 +106,15 @@ class NotificationService
if
note
.
commit_id
.
present?
opts
.
merge!
(
commit_id:
note
.
commit_id
)
recipients
=
[
note
.
commit_author
]
else
opts
.
merge!
(
noteable_id:
note
.
noteable_id
)
target
=
note
.
noteable
if
target
.
respond_to?
(
:participants
)
recipients
=
target
.
participants
else
recipients
=
[]
end
end
target
=
note
.
noteable
if
target
.
respond_to?
(
:participants
)
recipients
=
target
.
participants
else
recipients
=
note
.
mentioned_users
end
# Get users who left comment in thread
...
...
spec/services/notification_service_spec.rb
浏览文件 @
cb877b7e
...
...
@@ -48,7 +48,7 @@ describe NotificationService do
end
context
'commit note'
do
let
(
:note
)
{
create
:note_on_commit
}
let
(
:note
)
{
create
(
:note_on_commit
,
note:
'@mention referenced'
)
}
before
do
build_team
(
note
.
project
)
...
...
@@ -57,6 +57,7 @@ describe NotificationService do
describe
:new_note
do
it
do
should_email
(
@u_watcher
.
id
)
should_email
(
@u_mentioned
.
id
)
should_not_email
(
note
.
author_id
)
should_not_email
(
@u_participating
.
id
)
should_not_email
(
@u_disabled
.
id
)
...
...
@@ -67,10 +68,12 @@ describe NotificationService do
create
(
:note_on_commit
,
author:
@u_participating
,
project_id:
note
.
project_id
,
commit_id:
note
.
commit_id
)
commit_id:
note
.
commit_id
,
note:
'@mention referenced'
)
should_email
(
@u_watcher
.
id
)
should_email
(
@u_participating
.
id
)
should_email
(
@u_mentioned
.
id
)
should_not_email
(
note
.
author_id
)
should_not_email
(
@u_disabled
.
id
)
notification
.
new_note
(
note
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录