Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
80daf9a7
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,发现更多精彩内容 >>
未验证
提交
80daf9a7
编写于
3月 25, 2014
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use current_user for Notification#merge_mr
Signed-off-by:
N
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
上级
8bbac457
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
4 addition
and
4 deletion
+4
-4
app/services/merge_requests/auto_merge_service.rb
app/services/merge_requests/auto_merge_service.rb
+1
-1
app/services/merge_requests/merge_service.rb
app/services/merge_requests/merge_service.rb
+1
-1
app/services/notification_service.rb
app/services/notification_service.rb
+2
-2
未找到文件。
app/services/merge_requests/auto_merge_service.rb
浏览文件 @
80daf9a7
...
...
@@ -12,7 +12,7 @@ module MergeRequests
merge_request
.
author_id_of_changes
=
current_user
.
id
merge_request
.
merge
notification
.
merge_mr
(
merge_request
)
notification
.
merge_mr
(
merge_request
,
current_user
)
create_merge_event
(
merge_request
)
execute_project_hooks
(
merge_request
)
...
...
app/services/merge_requests/merge_service.rb
浏览文件 @
80daf9a7
...
...
@@ -10,7 +10,7 @@ module MergeRequests
merge_request
.
author_id_of_changes
=
current_user
.
id
merge_request
.
merge
notification
.
merge_mr
(
merge_request
)
notification
.
merge_mr
(
merge_request
,
current_user
)
create_merge_event
(
merge_request
)
execute_project_hooks
(
merge_request
)
...
...
app/services/notification_service.rb
浏览文件 @
80daf9a7
...
...
@@ -86,12 +86,12 @@ class NotificationService
# * merge_request assignee if their notification level is not Disabled
# * project team members with notification level higher then Participating
#
def
merge_mr
(
merge_request
)
def
merge_mr
(
merge_request
,
current_user
)
recipients
=
reject_muted_users
([
merge_request
.
author
,
merge_request
.
assignee
],
merge_request
.
target_project
)
recipients
=
recipients
.
concat
(
project_watchers
(
merge_request
.
target_project
)).
uniq
recipients
.
each
do
|
recipient
|
mailer
.
merged_merge_request_email
(
recipient
.
id
,
merge_request
.
id
,
merge_request
.
author_id_of_changes
)
mailer
.
merged_merge_request_email
(
recipient
.
id
,
merge_request
.
id
,
current_user
.
id
)
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录