Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
f49fb5dc
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,发现更多精彩内容 >>
提交
f49fb5dc
编写于
7月 01, 2013
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix error when reassign issue/merge_request from non-assigned. Fixes #3201
上级
ef9298fe
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
12 addition
and
10 deletion
+12
-10
app/mailers/emails/issues.rb
app/mailers/emails/issues.rb
+1
-1
app/mailers/emails/merge_requests.rb
app/mailers/emails/merge_requests.rb
+1
-1
app/views/notify/reassigned_issue_email.html.haml
app/views/notify/reassigned_issue_email.html.haml
+4
-2
app/views/notify/reassigned_issue_email.text.erb
app/views/notify/reassigned_issue_email.text.erb
+1
-3
app/views/notify/reassigned_merge_request_email.html.haml
app/views/notify/reassigned_merge_request_email.html.haml
+4
-2
app/views/notify/reassigned_merge_request_email.text.erb
app/views/notify/reassigned_merge_request_email.text.erb
+1
-1
未找到文件。
app/mailers/emails/issues.rb
浏览文件 @
f49fb5dc
...
...
@@ -8,7 +8,7 @@ module Emails
def
reassigned_issue_email
(
recipient_id
,
issue_id
,
previous_assignee_id
)
@issue
=
Issue
.
find
(
issue_id
)
@previous_assignee
||=
User
.
find
(
previous_assignee_id
)
@previous_assignee
=
User
.
find_by_id
(
previous_assignee_id
)
if
previous_assignee_id
@project
=
@issue
.
project
mail
(
to:
recipient
(
recipient_id
),
subject:
subject
(
"changed issue #
#{
@issue
.
id
}
"
,
@issue
.
title
))
end
...
...
app/mailers/emails/merge_requests.rb
浏览文件 @
f49fb5dc
...
...
@@ -8,7 +8,7 @@ module Emails
def
reassigned_merge_request_email
(
recipient_id
,
merge_request_id
,
previous_assignee_id
)
@merge_request
=
MergeRequest
.
find
(
merge_request_id
)
@previous_assignee
||=
User
.
find
(
previous_assignee_id
)
@previous_assignee
=
User
.
find_by_id
(
previous_assignee_id
)
if
previous_assignee_id
@project
=
@merge_request
.
project
mail
(
to:
recipient
(
recipient_id
),
subject:
subject
(
"changed merge request !
#{
@merge_request
.
id
}
"
,
@merge_request
.
title
))
end
...
...
app/views/notify/reassigned_issue_email.html.haml
浏览文件 @
f49fb5dc
...
...
@@ -2,8 +2,10 @@
=
"Reassigned Issue #
#{
@issue
.
id
}
"
=
link_to_gfm
truncate
(
@issue
.
title
,
length:
30
),
project_issue_url
(
@issue
.
project
,
@issue
)
%p
Assignee changed from
%strong
#{
@previous_assignee
.
name
}
Assignee changed
-
if
@previous_assignee
from
%strong
#{
@previous_assignee
.
name
}
to
%strong
#{
@issue
.
assignee_name
}
app/views/notify/reassigned_issue_email.text.erb
浏览文件 @
f49fb5dc
...
...
@@ -2,6 +2,4 @@ Reassigned Issue <%= @issue.id %>
<%=
url_for
(
project_issue_url
(
@issue
.
project
,
@issue
))
%>
Assignee changed from
<%=
@previous_assignee
.
name
%>
to
<%=
@issue
.
assignee_name
%>
Assignee changed
<%=
"from
#{
@previous_assignee
.
name
}
"
if
@previous_assignee
%>
to
<%=
@issue
.
assignee_name
%>
app/views/notify/reassigned_merge_request_email.html.haml
浏览文件 @
f49fb5dc
...
...
@@ -2,7 +2,9 @@
=
"Reassigned Merge Request !
#{
@merge_request
.
id
}
"
=
link_to_gfm
truncate
(
@merge_request
.
title
,
length:
30
),
project_merge_request_url
(
@merge_request
.
project
,
@merge_request
)
%p
Assignee changed from
%strong
#{
@previous_assignee
.
name
}
Assignee changed
-
if
@previous_assignee
from
%strong
#{
@previous_assignee
.
name
}
to
%strong
#{
@merge_request
.
assignee_name
}
app/views/notify/reassigned_merge_request_email.text.erb
浏览文件 @
f49fb5dc
...
...
@@ -3,5 +3,5 @@ Reassigned Merge Request <%= @merge_request.id %>
<%=
url_for
(
project_merge_request_url
(
@merge_request
.
project
,
@merge_request
))
%>
Assignee changed
from
<%=
@previous_assignee
.
nam
e
%>
to
<%=
@merge_request
.
assignee_name
%>
Assignee changed
<%=
"from
#{
@previous_assignee
.
name
}
"
if
@previous_assigne
e
%>
to
<%=
@merge_request
.
assignee_name
%>
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录