Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
310231db
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,发现更多精彩内容 >>
提交
310231db
编写于
7月 03, 2014
作者:
M
Marin Jankovski
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Reopen mr email notification.
上级
1208c6ca
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
28 addition
and
0 deletion
+28
-0
app/mailers/emails/merge_requests.rb
app/mailers/emails/merge_requests.rb
+13
-0
app/services/merge_requests/reopen_service.rb
app/services/merge_requests/reopen_service.rb
+1
-0
app/services/notification_service.rb
app/services/notification_service.rb
+4
-0
app/views/notify/merge_request_status_email.html.haml
app/views/notify/merge_request_status_email.html.haml
+2
-0
app/views/notify/merge_request_status_email.text.haml
app/views/notify/merge_request_status_email.text.haml
+8
-0
未找到文件。
app/mailers/emails/merge_requests.rb
浏览文件 @
310231db
...
...
@@ -41,6 +41,19 @@ module Emails
to:
recipient
(
recipient_id
),
subject:
subject
(
"
#{
@merge_request
.
title
}
(#
#{
@merge_request
.
iid
}
)"
))
end
def
merge_request_status_email
(
recipient_id
,
merge_request_id
,
status
,
updated_by_user_id
)
@merge_request
=
MergeRequest
.
find
(
merge_request_id
)
@mr_status
=
status
@project
=
@merge_request
.
project
@updated_by
=
User
.
find
updated_by_user_id
@target_url
=
project_merge_request_url
(
@project
,
@merge_request
)
set_reference
(
"merge_request_
#{
merge_request_id
}
"
)
mail
(
from:
sender
(
updated_by_user_id
),
to:
recipient
(
recipient_id
),
subject:
subject
(
"
#{
@merge_request
.
title
}
(#
#{
@merge_request
.
iid
}
)
#{
@mr_status
}
"
))
end
end
# Over rides default behavour to show source/target
...
...
app/services/merge_requests/reopen_service.rb
浏览文件 @
310231db
...
...
@@ -3,6 +3,7 @@ module MergeRequests
def
execute
(
merge_request
)
if
merge_request
.
reopen
event_service
.
reopen_mr
(
merge_request
,
current_user
)
notification_service
.
reopen_mr
(
merge_request
,
current_user
)
create_note
(
merge_request
)
execute_hooks
(
merge_request
)
merge_request
.
reload_code
...
...
app/services/notification_service.rb
浏览文件 @
310231db
...
...
@@ -99,6 +99,10 @@ class NotificationService
end
end
def
reopen_mr
(
merge_request
,
current_user
)
reopen_resource_email
(
merge_request
,
merge_request
.
target_project
,
current_user
,
'merge_request_status_email'
,
'reopened'
)
end
# Notify new user with email after creation
def
new_user
(
user
)
# Don't email omniauth created users
...
...
app/views/notify/merge_request_status_email.html.haml
0 → 100644
浏览文件 @
310231db
%p
=
"Merge Request #
#{
@merge_request
.
iid
}
was
#{
@mr_status
}
by
#{
@updated_by
.
name
}
"
app/views/notify/merge_request_status_email.text.haml
0 → 100644
浏览文件 @
310231db
=
"Merge Request #
#{
@merge_request
.
iid
}
was
#{
@mr_status
}
by
#{
@updated_by
.
name
}
"
Merge Request url:
#{
project_merge_request_url
(
@merge_request
.
target_project
,
@merge_request
)
}
=
merge_path_description
(
@merge_request
,
'to'
)
Author:
#{
@merge_request
.
author_name
}
Assignee:
#{
@merge_request
.
assignee_name
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录