Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
59769fdb
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,发现更多精彩内容 >>
未验证
提交
59769fdb
编写于
2月 12, 2014
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Improve compare logic for EmailOnPush service
Signed-off-by:
N
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
上级
0bcabdaf
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
13 addition
and
2 deletion
+13
-2
app/mailers/emails/projects.rb
app/mailers/emails/projects.rb
+1
-0
app/views/notify/repository_push_email.html.haml
app/views/notify/repository_push_email.html.haml
+5
-0
app/views/notify/repository_push_email.text.haml
app/views/notify/repository_push_email.text.haml
+5
-0
app/workers/emails_on_push_worker.rb
app/workers/emails_on_push_worker.rb
+2
-2
未找到文件。
app/mailers/emails/projects.rb
浏览文件 @
59769fdb
...
...
@@ -17,6 +17,7 @@ module Emails
def
repository_push_email
(
project_id
,
recipient
,
author_id
,
branch
,
compare
)
@project
=
Project
.
find
(
project_id
)
@author
=
User
.
find
(
author_id
)
@compare
=
compare
@commits
=
Commit
.
decorate
(
compare
.
commits
)
@diffs
=
compare
.
diffs
@branch
=
branch
...
...
app/views/notify/repository_push_email.html.haml
浏览文件 @
59769fdb
...
...
@@ -21,3 +21,8 @@
%pre
=
diff
.
diff
%br
-
if
@compare
.
timeout
%h5
Huge diff. To prevent performance issues it was hidden
-
elsif
@compare
.
commits_over_limit?
%h5
Diff for big amount of commits is disabled
app/views/notify/repository_push_email.text.haml
浏览文件 @
59769fdb
...
...
@@ -18,3 +18,8 @@ Diff:
=
diff
.
new_path
||
diff
.
old_path
\=====================================
=
diff
.
diff
\
-
if
@compare
.
timeout
Huge diff. To prevent performance issues it was hidden
-
elsif
@compare
.
commits_over_limit?
Diff for big amount of commits is disabled
app/workers/emails_on_push_worker.rb
浏览文件 @
59769fdb
...
...
@@ -13,13 +13,13 @@ class EmailsOnPushWorker
return
true
end
compare
=
Gitlab
::
Git
::
Compare
.
new
(
project
.
repository
.
raw_repository
,
before_sha
,
after_sha
)
compare
=
Gitlab
::
Git
::
Compare
.
new
(
project
.
repository
.
raw_repository
,
before_sha
,
after_sha
,
MergeRequestDiff
::
COMMITS_SAFE_SIZE
)
# Do not send emails if git compare failed
return
false
unless
compare
&&
compare
.
commits
.
present?
recipients
.
split
(
" "
).
each
do
|
recipient
|
Notify
.
delay
.
repository_push_email
(
project_id
,
recipient
,
author_id
,
branch
,
compare
)
Notify
.
repository_push_email
(
project_id
,
recipient
,
author_id
,
branch
,
compare
).
deliver
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录