Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
fa936c68
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,发现更多精彩内容 >>
提交
fa936c68
编写于
11月 21, 2016
作者:
L
Lin Jen-Shin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
External jobs do not have show page nor traces
Fixes #24677
上级
900999f8
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
22 addition
and
6 deletion
+22
-6
app/views/notify/pipeline_failed_email.html.haml
app/views/notify/pipeline_failed_email.html.haml
+12
-4
app/views/notify/pipeline_failed_email.text.erb
app/views/notify/pipeline_failed_email.text.erb
+3
-1
spec/models/ci/pipeline_spec.rb
spec/models/ci/pipeline_spec.rb
+7
-1
未找到文件。
app/views/notify/pipeline_failed_email.html.haml
浏览文件 @
fa936c68
...
@@ -158,12 +158,20 @@
...
@@ -158,12 +158,20 @@
%td
{
style:
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;color:#8c8c8c;font-weight:500;font-size:15px;vertical-align:middle;"
}
%td
{
style:
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;color:#8c8c8c;font-weight:500;font-size:15px;vertical-align:middle;"
}
=
build
.
stage
=
build
.
stage
%td
{
align:
"right"
,
style:
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:20px 0;color:#8c8c8c;font-weight:500;font-size:15px;"
}
%td
{
align:
"right"
,
style:
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:20px 0;color:#8c8c8c;font-weight:500;font-size:15px;"
}
%a
{
href:
pipeline_build_url
(
@pipeline
,
build
),
style:
"color:#3777b0;text-decoration:none;"
}
-
case
build
-
when
Ci
::
Build
%a
{
href:
pipeline_build_url
(
@pipeline
,
build
),
style:
"color:#3777b0;text-decoration:none;"
}
=
build
.
name
-
when
GenericCommitStatus
=
build
.
name
=
build
.
name
%tr
.build-log
%tr
.build-log
%td
{
colspan:
"2"
,
style:
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:0 0 15px;"
}
-
case
build
%pre
{
style:
"font-family:Monaco,'Lucida Console','Courier New',Courier,monospace;background-color:#fafafa;border-radius:3px;overflow:hidden;white-space:pre-wrap;word-break:break-all;font-size:13px;line-height:1.4;padding:12px;color:#333333;margin:0;"
}
-
when
Ci
::
Build
=
build
.
trace_html
(
last_lines:
10
).
html_safe
%td
{
colspan:
"2"
,
style:
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:0 0 15px;"
}
%pre
{
style:
"font-family:Monaco,'Lucida Console','Courier New',Courier,monospace;background-color:#fafafa;border-radius:3px;overflow:hidden;white-space:pre-wrap;word-break:break-all;font-size:13px;line-height:1.4;padding:12px;color:#333333;margin:0;"
}
=
build
.
trace_html
(
last_lines:
10
).
html_safe
-
when
GenericCommitStatus
%td
{
colspan:
"2"
}
%tr
.footer
%tr
.footer
%td
{
style:
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:25px 0;font-size:13px;line-height:1.6;color:#5c5c5c;"
}
%td
{
style:
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:25px 0;font-size:13px;line-height:1.6;color:#5c5c5c;"
}
%img
{
alt:
"GitLab"
,
height:
"33"
,
src:
image_url
(
'mailers/ci_pipeline_notif_v1/gitlab-logo-full-horizontal.gif'
),
style:
"display:block;margin:0 auto 1em;"
,
width:
"90"
}
/
%img
{
alt:
"GitLab"
,
height:
"33"
,
src:
image_url
(
'mailers/ci_pipeline_notif_v1/gitlab-logo-full-horizontal.gif'
),
style:
"display:block;margin:0 auto 1em;"
,
width:
"90"
}
/
...
...
app/views/notify/pipeline_failed_email.text.erb
浏览文件 @
fa936c68
...
@@ -19,10 +19,12 @@ Commit Author: <%= commit.author_name %>
...
@@ -19,10 +19,12 @@ Commit Author: <%= commit.author_name %>
Pipeline #
<%=
@pipeline
.
id
%>
(
<%=
pipeline_url
(
@pipeline
)
%>
) had
<%=
failed
.
size
%>
failed
<%=
'build'
.
pluralize
(
failed
.
size
)
%>
.
Pipeline #
<%=
@pipeline
.
id
%>
(
<%=
pipeline_url
(
@pipeline
)
%>
) had
<%=
failed
.
size
%>
failed
<%=
'build'
.
pluralize
(
failed
.
size
)
%>
.
<%
failed
.
each
do
|
build
|
-%>
<%
failed
.
each
do
|
build
|
-%>
Build #
<%=
build
.
id
%>
(
<%=
pipeline_build_url
(
@pipeline
,
build
)
%>
)
Build #
<%=
build
.
id
%>
<%=
if
build
.
kind_of?
(
Ci
::
Build
)
then
" (
#{
pipeline_build_url
(
@pipeline
,
build
)
}
)"
end
%>
Stage:
<%=
build
.
stage
%>
Stage:
<%=
build
.
stage
%>
Name:
<%=
build
.
name
%>
Name:
<%=
build
.
name
%>
<%
if
build
.
kind_of?
(
Ci
::
Build
)
-%>
Trace:
<%=
build
.
trace_with_state
(
last_lines:
10
)[
:text
]
%>
Trace:
<%=
build
.
trace_with_state
(
last_lines:
10
)[
:text
]
%>
<%
end
-%>
<%
end
-%>
<%
end
-%>
...
...
spec/models/ci/pipeline_spec.rb
浏览文件 @
fa936c68
...
@@ -571,7 +571,13 @@ describe Ci::Pipeline, models: true do
...
@@ -571,7 +571,13 @@ describe Ci::Pipeline, models: true do
context
'with failed pipeline'
do
context
'with failed pipeline'
do
before
do
before
do
perform_enqueued_jobs
do
perform_enqueued_jobs
do
pipeline
.
drop
create
(
:ci_build
,
:created
,
pipeline:
pipeline
)
create
(
:generic_commit_status
,
:created
,
pipeline:
pipeline
)
pipeline
.
statuses
.
count
.
times
do
|
offset
|
# workaround race conditions
pipeline
.
statuses
.
offset
(
offset
).
first
.
drop
end
end
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录