Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
cb34be7d
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,发现更多精彩内容 >>
提交
cb34be7d
编写于
11月 16, 2016
作者:
L
Lin Jen-Shin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix pipeline author for Slack and use pipeline id
rather than using SHA for the pipeline link.
上级
3255401e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
5 addition
and
6 deletion
+5
-6
app/models/project_services/slack_service/pipeline_message.rb
...models/project_services/slack_service/pipeline_message.rb
+3
-4
spec/models/project_services/slack_service/pipeline_message_spec.rb
...s/project_services/slack_service/pipeline_message_spec.rb
+2
-2
未找到文件。
app/models/project_services/slack_service/pipeline_message.rb
浏览文件 @
cb34be7d
class
SlackService
class
SlackService
class
PipelineMessage
<
BaseMessage
class
PipelineMessage
<
BaseMessage
attr_reader
:
sha
,
:
ref_type
,
:ref
,
:status
,
:project_name
,
:project_url
,
attr_reader
:ref_type
,
:ref
,
:status
,
:project_name
,
:project_url
,
:user_name
,
:duration
,
:pipeline_id
:user_name
,
:duration
,
:pipeline_id
def
initialize
(
data
)
def
initialize
(
data
)
pipeline_attributes
=
data
[
:object_attributes
]
pipeline_attributes
=
data
[
:object_attributes
]
@sha
=
pipeline_attributes
[
:sha
]
@ref_type
=
pipeline_attributes
[
:tag
]
?
'tag'
:
'branch'
@ref_type
=
pipeline_attributes
[
:tag
]
?
'tag'
:
'branch'
@ref
=
pipeline_attributes
[
:ref
]
@ref
=
pipeline_attributes
[
:ref
]
@status
=
pipeline_attributes
[
:status
]
@status
=
pipeline_attributes
[
:status
]
...
@@ -14,7 +13,7 @@ class SlackService
...
@@ -14,7 +13,7 @@ class SlackService
@project_name
=
data
[
:project
][
:path_with_namespace
]
@project_name
=
data
[
:project
][
:path_with_namespace
]
@project_url
=
data
[
:project
][
:web_url
]
@project_url
=
data
[
:project
][
:web_url
]
@user_name
=
data
[
:
commit
]
&&
data
[
:commit
][
:author_
name
]
@user_name
=
data
[
:
user
]
&&
data
[
:user
][
:
name
]
end
end
def
pretext
def
pretext
...
@@ -73,7 +72,7 @@ class SlackService
...
@@ -73,7 +72,7 @@ class SlackService
end
end
def
pipeline_link
def
pipeline_link
"[
#
{
Commit
.
truncate_sha
(
sha
)
}
](
#{
pipeline_url
}
)"
"[#
#{
pipeline_id
}
](
#{
pipeline_url
}
)"
end
end
end
end
end
end
spec/models/project_services/slack_service/pipeline_message_spec.rb
浏览文件 @
cb34be7d
...
@@ -15,7 +15,7 @@ describe SlackService::PipelineMessage do
...
@@ -15,7 +15,7 @@ describe SlackService::PipelineMessage do
},
},
project:
{
path_with_namespace:
'project_name'
,
project:
{
path_with_namespace:
'project_name'
,
web_url:
'example.gitlab.com'
},
web_url:
'example.gitlab.com'
},
commit:
{
author_
name:
'hacker'
}
user:
{
name:
'hacker'
}
}
}
end
end
...
@@ -48,7 +48,7 @@ describe SlackService::PipelineMessage do
...
@@ -48,7 +48,7 @@ describe SlackService::PipelineMessage do
def
build_message
(
status_text
=
status
)
def
build_message
(
status_text
=
status
)
"<example.gitlab.com|project_name>:"
\
"<example.gitlab.com|project_name>:"
\
" Pipeline <example.gitlab.com/pipelines/123|
97de212e
>"
\
" Pipeline <example.gitlab.com/pipelines/123|
#123
>"
\
" of <example.gitlab.com/commits/develop|develop> branch"
\
" of <example.gitlab.com/commits/develop|develop> branch"
\
" by hacker
#{
status_text
}
in
#{
duration
}
#{
'second'
.
pluralize
(
duration
)
}
"
" by hacker
#{
status_text
}
in
#{
duration
}
#{
'second'
.
pluralize
(
duration
)
}
"
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录