Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
8dcc8e5d
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,发现更多精彩内容 >>
未验证
提交
8dcc8e5d
编写于
10月 07, 2015
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix routing in CI mailer
Signed-off-by:
N
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
上级
82b6a17c
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
9 addition
and
10 deletion
+9
-10
app/models/project_services/ci/hip_chat_message.rb
app/models/project_services/ci/hip_chat_message.rb
+1
-1
app/models/project_services/ci/slack_message.rb
app/models/project_services/ci/slack_message.rb
+2
-2
app/models/project_services/gitlab_ci_service.rb
app/models/project_services/gitlab_ci_service.rb
+1
-1
app/views/ci/notify/build_fail_email.html.haml
app/views/ci/notify/build_fail_email.html.haml
+1
-1
app/views/ci/notify/build_fail_email.text.erb
app/views/ci/notify/build_fail_email.text.erb
+1
-1
app/views/ci/notify/build_success_email.html.haml
app/views/ci/notify/build_success_email.html.haml
+1
-1
app/views/ci/notify/build_success_email.text.erb
app/views/ci/notify/build_success_email.text.erb
+1
-1
spec/models/project_services/gitlab_ci_service_spec.rb
spec/models/project_services/gitlab_ci_service_spec.rb
+1
-2
未找到文件。
app/models/project_services/ci/hip_chat_message.rb
浏览文件 @
8dcc8e5d
...
...
@@ -11,7 +11,7 @@ module Ci
def
to_s
lines
=
Array
.
new
lines
.
push
(
"<a href=
\"
#{
ci_project_url
(
project
)
}
\"
>
#{
project
.
name
}
</a> - "
)
lines
.
push
(
"<a href=
\"
#{
ci_
project_commits_url
(
project
,
commit
.
sha
)
}
\"
>Commit #
#{
commit
.
id
}
</a></br>"
)
lines
.
push
(
"<a href=
\"
#{
ci_
namespace_project_commit_url
(
commit
.
gl_project
.
namespace
,
commit
.
gl_
project
,
commit
.
sha
)
}
\"
>Commit #
#{
commit
.
id
}
</a></br>"
)
lines
.
push
(
"
#{
commit
.
short_sha
}
#{
commit
.
git_author_name
}
-
#{
commit
.
git_commit_message
}
</br>"
)
lines
.
push
(
"
#{
humanized_status
(
commit_status
)
}
in
#{
commit
.
duration
}
second(s)."
)
lines
.
join
(
''
)
...
...
app/models/project_services/ci/slack_message.rb
浏览文件 @
8dcc8e5d
...
...
@@ -28,7 +28,7 @@ module Ci
next
unless
build
.
failed?
fields
<<
{
title:
build
.
name
,
value:
"Build <
#{
ci_project_build_url
(
project
,
build
)
}
|
\#
#{
build
.
id
}
> failed in
#{
build
.
duration
.
to_i
}
second(s)."
value:
"Build <
#{
namespace_project_build_url
(
build
.
gl_project
.
namespace
,
build
.
gl_
project
,
build
)
}
|
\#
#{
build
.
id
}
> failed in
#{
build
.
duration
.
to_i
}
second(s)."
}
end
...
...
@@ -45,7 +45,7 @@ module Ci
def
attachment_message
out
=
"<
#{
ci_project_url
(
project
)
}
|
#{
project_name
}
>: "
out
<<
"Commit <
#{
ci_
project_commits_url
(
project
,
commit
.
sha
)
}
|
\#
#{
commit
.
id
}
> "
out
<<
"Commit <
#{
ci_
namespace_project_commit_url
(
commit
.
gl_project
.
namespace
,
commit
.
gl_
project
,
commit
.
sha
)
}
|
\#
#{
commit
.
id
}
> "
out
<<
"(<
#{
commit_sha_link
}
|
#{
commit
.
short_sha
}
>) "
out
<<
"of <
#{
commit_ref_link
}
|
#{
commit
.
ref
}
> "
out
<<
"by
#{
commit
.
git_author_name
}
"
if
commit
.
git_author_name
...
...
app/models/project_services/gitlab_ci_service.rb
浏览文件 @
8dcc8e5d
...
...
@@ -71,7 +71,7 @@ class GitlabCiService < CiService
def
build_page
(
sha
,
ref
)
if
project
.
gitlab_ci_project
.
present?
ci_
project_commits_url
(
project
.
gitlab_ci_
project
,
sha
)
ci_
namespace_project_commit_url
(
project
.
namespace
,
project
,
sha
)
end
end
...
...
app/views/ci/notify/build_fail_email.html.haml
浏览文件 @
8dcc8e5d
...
...
@@ -16,4 +16,4 @@
Message:
#{
@build
.
commit
.
git_commit_message
}
%p
Url:
#{
link_to
@build
.
short_sha
,
ci_project_build_url
(
@
project
,
@build
)
}
Url:
#{
link_to
@build
.
short_sha
,
namespace_project_build_url
(
@build
.
gl_project
.
namespace
,
@build
.
gl_
project
,
@build
)
}
app/views/ci/notify/build_fail_email.text.erb
浏览文件 @
8dcc8e5d
...
...
@@ -6,4 +6,4 @@ Author: <%= @build.commit.git_author_name %>
Branch:
<%=
@build
.
ref
%>
Message:
<%=
@build
.
commit
.
git_commit_message
%>
Url:
<%=
ci_project_build_url
(
@build
.
project
,
@build
)
%>
Url:
<%=
namespace_project_build_url
(
@build
.
gl_project
.
namespace
,
@build
.
gl_
project
,
@build
)
%>
app/views/ci/notify/build_success_email.html.haml
浏览文件 @
8dcc8e5d
...
...
@@ -17,4 +17,4 @@
Message:
#{
@build
.
commit
.
git_commit_message
}
%p
Url:
#{
link_to
@build
.
short_sha
,
ci_project_build_url
(
@
project
,
@build
)
}
Url:
#{
link_to
@build
.
short_sha
,
namespace_project_build_url
(
@build
.
gl_project
.
namespace
,
@build
.
gl_
project
,
@build
)
}
app/views/ci/notify/build_success_email.text.erb
浏览文件 @
8dcc8e5d
...
...
@@ -6,4 +6,4 @@ Author: <%= @build.commit.git_author_name %>
Branch:
<%=
@build
.
ref
%>
Message:
<%=
@build
.
commit
.
git_commit_message
%>
Url:
<%=
ci_project_build_url
(
@build
.
project
,
@build
)
%>
Url:
<%=
namespace_project_build_url
(
@build
.
gl_project
.
namespace
,
@build
.
gl_
project
,
@build
)
%>
spec/models/project_services/gitlab_ci_service_spec.rb
浏览文件 @
8dcc8e5d
...
...
@@ -39,8 +39,7 @@ describe GitlabCiService do
end
describe
:build_page
do
it
{
expect
(
@service
.
build_page
(
"2ab7834c"
,
'master'
)).
to
eq
(
"http://localhost/ci/projects/
#{
@ci_project
.
id
}
/commits/2ab7834c"
)}
it
{
expect
(
@service
.
build_page
(
"issue#2"
,
'master'
)).
to
eq
(
"http://localhost/ci/projects/
#{
@ci_project
.
id
}
/commits/issue%232"
)}
it
{
expect
(
@service
.
build_page
(
"2ab7834c"
,
'master'
)).
to
eq
(
"http://localhost/
#{
@ci_project
.
gl_project
.
path_with_namespace
}
/commit/2ab7834c/ci"
)}
end
describe
"execute"
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录