Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
cb34be7d
Commit
cb34be7d
authored
Nov 16, 2016
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix pipeline author for Slack and use pipeline id
rather than using SHA for the pipeline link.
parent
3255401e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
6 deletions
+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
No files found.
app/models/project_services/slack_service/pipeline_message.rb
View file @
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
View file @
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment