Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
0b38e213
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,发现更多精彩内容 >>
提交
0b38e213
编写于
9月 30, 2016
作者:
S
secustor
提交者:
secustor
10月 03, 2016
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Changed Slack service user referencing from full name to username
上级
9235f1d4
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
25 addition
and
24 deletion
+25
-24
CHANGELOG
CHANGELOG
+1
-0
app/models/project_services/slack_service/issue_message.rb
app/models/project_services/slack_service/issue_message.rb
+1
-1
app/models/project_services/slack_service/merge_message.rb
app/models/project_services/slack_service/merge_message.rb
+1
-1
app/models/project_services/slack_service/note_message.rb
app/models/project_services/slack_service/note_message.rb
+1
-1
app/models/project_services/slack_service/wiki_page_message.rb
...odels/project_services/slack_service/wiki_page_message.rb
+1
-1
spec/models/project_services/slack_service/issue_message_spec.rb
...dels/project_services/slack_service/issue_message_spec.rb
+3
-3
spec/models/project_services/slack_service/merge_message_spec.rb
...dels/project_services/slack_service/merge_message_spec.rb
+3
-3
spec/models/project_services/slack_service/note_message_spec.rb
...odels/project_services/slack_service/note_message_spec.rb
+5
-5
spec/models/project_services/slack_service/push_message_spec.rb
...odels/project_services/slack_service/push_message_spec.rb
+6
-6
spec/models/project_services/slack_service/wiki_page_message_spec.rb
.../project_services/slack_service/wiki_page_message_spec.rb
+3
-3
未找到文件。
CHANGELOG
浏览文件 @
0b38e213
...
...
@@ -34,6 +34,7 @@ v 8.13.0 (unreleased)
- Notify the Merger about merge after successful build (Dimitris Karakasilis)
- Fix broken repository 500 errors in project list
- Close todos when accepting merge requests via the API !6486 (tonygambone)
- Changed Slack service user referencing from full name to username (Sebastian Poxhofer)
v 8.12.4 (unreleased)
...
...
app/models/project_services/slack_service/issue_message.rb
浏览文件 @
0b38e213
...
...
@@ -11,7 +11,7 @@ class SlackService
attr_reader
:description
def
initialize
(
params
)
@user_name
=
params
[
:user
][
:name
]
@user_name
=
params
[
:user
][
:
user
name
]
@project_name
=
params
[
:project_name
]
@project_url
=
params
[
:project_url
]
...
...
app/models/project_services/slack_service/merge_message.rb
浏览文件 @
0b38e213
...
...
@@ -10,7 +10,7 @@ class SlackService
attr_reader
:title
def
initialize
(
params
)
@user_name
=
params
[
:user
][
:name
]
@user_name
=
params
[
:user
][
:
user
name
]
@project_name
=
params
[
:project_name
]
@project_url
=
params
[
:project_url
]
...
...
app/models/project_services/slack_service/note_message.rb
浏览文件 @
0b38e213
...
...
@@ -10,7 +10,7 @@ class SlackService
def
initialize
(
params
)
params
=
HashWithIndifferentAccess
.
new
(
params
)
@user_name
=
params
[
:user
][
:name
]
@user_name
=
params
[
:user
][
:
user
name
]
@project_name
=
params
[
:project_name
]
@project_url
=
params
[
:project_url
]
...
...
app/models/project_services/slack_service/wiki_page_message.rb
浏览文件 @
0b38e213
...
...
@@ -9,7 +9,7 @@ class SlackService
attr_reader
:description
def
initialize
(
params
)
@user_name
=
params
[
:user
][
:name
]
@user_name
=
params
[
:user
][
:
user
name
]
@project_name
=
params
[
:project_name
]
@project_url
=
params
[
:project_url
]
...
...
spec/models/project_services/slack_service/issue_message_spec.rb
浏览文件 @
0b38e213
...
...
@@ -7,7 +7,7 @@ describe SlackService::IssueMessage, models: true do
{
user:
{
name:
'Test User'
,
username:
'
Test U
ser'
username:
'
test.u
ser'
},
project_name:
'project_name'
,
project_url:
'somewhere.com'
,
...
...
@@ -40,7 +40,7 @@ describe SlackService::IssueMessage, models: true do
context
'open'
do
it
'returns a message regarding opening of issues'
do
expect
(
subject
.
pretext
).
to
eq
(
'<somewhere.com|[project_name>] Issue opened by
Test U
ser'
)
'<somewhere.com|[project_name>] Issue opened by
test.u
ser'
)
expect
(
subject
.
attachments
).
to
eq
([
{
title:
"#100 Issue title"
,
...
...
@@ -60,7 +60,7 @@ describe SlackService::IssueMessage, models: true do
it
'returns a message regarding closing of issues'
do
expect
(
subject
.
pretext
).
to
eq
(
'<somewhere.com|[project_name>] Issue <url|#100 Issue title> closed by
Test U
ser'
)
'<somewhere.com|[project_name>] Issue <url|#100 Issue title> closed by
test.u
ser'
)
expect
(
subject
.
attachments
).
to
be_empty
end
end
...
...
spec/models/project_services/slack_service/merge_message_spec.rb
浏览文件 @
0b38e213
...
...
@@ -7,7 +7,7 @@ describe SlackService::MergeMessage, models: true do
{
user:
{
name:
'Test User'
,
username:
'
Test U
ser'
username:
'
test.u
ser'
},
project_name:
'project_name'
,
project_url:
'somewhere.com'
,
...
...
@@ -31,7 +31,7 @@ describe SlackService::MergeMessage, models: true do
context
'open'
do
it
'returns a message regarding opening of merge requests'
do
expect
(
subject
.
pretext
).
to
eq
(
'
Test U
ser opened <somewhere.com/merge_requests/100|merge request !100> '
\
'
test.u
ser opened <somewhere.com/merge_requests/100|merge request !100> '
\
'in <somewhere.com|project_name>: *Issue title*'
)
expect
(
subject
.
attachments
).
to
be_empty
end
...
...
@@ -43,7 +43,7 @@ describe SlackService::MergeMessage, models: true do
end
it
'returns a message regarding closing of merge requests'
do
expect
(
subject
.
pretext
).
to
eq
(
'
Test U
ser closed <somewhere.com/merge_requests/100|merge request !100> '
\
'
test.u
ser closed <somewhere.com/merge_requests/100|merge request !100> '
\
'in <somewhere.com|project_name>: *Issue title*'
)
expect
(
subject
.
attachments
).
to
be_empty
end
...
...
spec/models/project_services/slack_service/note_message_spec.rb
浏览文件 @
0b38e213
...
...
@@ -7,7 +7,7 @@ describe SlackService::NoteMessage, models: true do
@args
=
{
user:
{
name:
'Test User'
,
username:
'
username
'
,
username:
'
test.user
'
,
avatar_url:
'http://fakeavatar'
},
project_name:
'project_name'
,
...
...
@@ -37,7 +37,7 @@ describe SlackService::NoteMessage, models: true do
it
'returns a message regarding notes on commits'
do
message
=
SlackService
::
NoteMessage
.
new
(
@args
)
expect
(
message
.
pretext
).
to
eq
(
"
Test U
ser commented on "
\
expect
(
message
.
pretext
).
to
eq
(
"
test.u
ser commented on "
\
"<url|commit 5f163b2b> in <somewhere.com|project_name>: "
\
"*Added a commit message*"
)
expected_attachments
=
[
...
...
@@ -63,7 +63,7 @@ describe SlackService::NoteMessage, models: true do
it
'returns a message regarding notes on a merge request'
do
message
=
SlackService
::
NoteMessage
.
new
(
@args
)
expect
(
message
.
pretext
).
to
eq
(
"
Test U
ser commented on "
\
expect
(
message
.
pretext
).
to
eq
(
"
test.u
ser commented on "
\
"<url|merge request !30> in <somewhere.com|project_name>: "
\
"*merge request title*"
)
expected_attachments
=
[
...
...
@@ -90,7 +90,7 @@ describe SlackService::NoteMessage, models: true do
it
'returns a message regarding notes on an issue'
do
message
=
SlackService
::
NoteMessage
.
new
(
@args
)
expect
(
message
.
pretext
).
to
eq
(
"
Test U
ser commented on "
\
"
test.u
ser commented on "
\
"<url|issue #20> in <somewhere.com|project_name>: "
\
"*issue title*"
)
expected_attachments
=
[
...
...
@@ -115,7 +115,7 @@ describe SlackService::NoteMessage, models: true do
it
'returns a message regarding notes on a project snippet'
do
message
=
SlackService
::
NoteMessage
.
new
(
@args
)
expect
(
message
.
pretext
).
to
eq
(
"
Test U
ser commented on "
\
expect
(
message
.
pretext
).
to
eq
(
"
test.u
ser commented on "
\
"<url|snippet #5> in <somewhere.com|project_name>: "
\
"*snippet title*"
)
expected_attachments
=
[
...
...
spec/models/project_services/slack_service/push_message_spec.rb
浏览文件 @
0b38e213
...
...
@@ -9,7 +9,7 @@ describe SlackService::PushMessage, models: true do
before:
'before'
,
project_name:
'project_name'
,
ref:
'refs/heads/master'
,
user_name:
'
user_name
'
,
user_name:
'
test.user
'
,
project_url:
'url'
}
end
...
...
@@ -26,7 +26,7 @@ describe SlackService::PushMessage, models: true do
it
'returns a message regarding pushes'
do
expect
(
subject
.
pretext
).
to
eq
(
'
user_name
pushed to branch <url/commits/master|master> of '
\
'
test.user
pushed to branch <url/commits/master|master> of '
\
'<url|project_name> (<url/compare/before...after|Compare changes>)'
)
expect
(
subject
.
attachments
).
to
eq
([
...
...
@@ -46,13 +46,13 @@ describe SlackService::PushMessage, models: true do
before:
Gitlab
::
Git
::
BLANK_SHA
,
project_name:
'project_name'
,
ref:
'refs/tags/new_tag'
,
user_name:
'
user_name
'
,
user_name:
'
test.user
'
,
project_url:
'url'
}
end
it
'returns a message regarding pushes'
do
expect
(
subject
.
pretext
).
to
eq
(
'
user_name
pushed new tag '
\
expect
(
subject
.
pretext
).
to
eq
(
'
test.user
pushed new tag '
\
'<url/commits/new_tag|new_tag> to '
\
'<url|project_name>'
)
expect
(
subject
.
attachments
).
to
be_empty
...
...
@@ -66,7 +66,7 @@ describe SlackService::PushMessage, models: true do
it
'returns a message regarding a new branch'
do
expect
(
subject
.
pretext
).
to
eq
(
'
user_name
pushed new branch <url/commits/master|master> to '
\
'
test.user
pushed new branch <url/commits/master|master> to '
\
'<url|project_name>'
)
expect
(
subject
.
attachments
).
to
be_empty
...
...
@@ -80,7 +80,7 @@ describe SlackService::PushMessage, models: true do
it
'returns a message regarding a removed branch'
do
expect
(
subject
.
pretext
).
to
eq
(
'
user_name
removed branch master from <url|project_name>'
'
test.user
removed branch master from <url|project_name>'
)
expect
(
subject
.
attachments
).
to
be_empty
end
...
...
spec/models/project_services/slack_service/wiki_page_message_spec.rb
浏览文件 @
0b38e213
...
...
@@ -7,7 +7,7 @@ describe SlackService::WikiPageMessage, models: true do
{
user:
{
name:
'Test User'
,
username:
'
Test U
ser'
username:
'
test.u
ser'
},
project_name:
'project_name'
,
project_url:
'somewhere.com'
,
...
...
@@ -25,7 +25,7 @@ describe SlackService::WikiPageMessage, models: true do
it
'returns a message that a new wiki page was created'
do
expect
(
subject
.
pretext
).
to
eq
(
'
Test U
ser created <url|wiki page> in <somewhere.com|project_name>: '
\
'
test.u
ser created <url|wiki page> in <somewhere.com|project_name>: '
\
'*Wiki page title*'
)
end
end
...
...
@@ -35,7 +35,7 @@ describe SlackService::WikiPageMessage, models: true do
it
'returns a message that a wiki page was updated'
do
expect
(
subject
.
pretext
).
to
eq
(
'
Test U
ser edited <url|wiki page> in <somewhere.com|project_name>: '
\
'
test.u
ser edited <url|wiki page> in <somewhere.com|project_name>: '
\
'*Wiki page title*'
)
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录