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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
f5e38419
Commit
f5e38419
authored
Aug 13, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
ffa38df4
25cee3e0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
4 deletions
+9
-4
app/models/project_services/chat_message/pipeline_message.rb
app/models/project_services/chat_message/pipeline_message.rb
+1
-1
changelogs/unreleased/66008-fix-project-image-in-slack-notifications.yml
...leased/66008-fix-project-image-in-slack-notifications.yml
+5
-0
spec/models/project_services/chat_message/pipeline_message_spec.rb
...ls/project_services/chat_message/pipeline_message_spec.rb
+3
-3
No files found.
app/models/project_services/chat_message/pipeline_message.rb
View file @
f5e38419
...
@@ -68,7 +68,7 @@ module ChatMessage
...
@@ -68,7 +68,7 @@ module ChatMessage
title_link:
pipeline_url
,
title_link:
pipeline_url
,
fields:
attachments_fields
,
fields:
attachments_fields
,
footer:
project
.
name
,
footer:
project
.
name
,
footer_icon:
project
.
avatar_url
,
footer_icon:
project
.
avatar_url
(
only_path:
false
)
,
ts:
finished_at
ts:
finished_at
}]
}]
end
end
...
...
changelogs/unreleased/66008-fix-project-image-in-slack-notifications.yml
0 → 100644
View file @
f5e38419
---
title
:
Fix project avatar image in Slack pipeline notifications
merge_request
:
31788
author
:
type
:
fixed
spec/models/project_services/chat_message/pipeline_message_spec.rb
View file @
f5e38419
...
@@ -42,9 +42,9 @@ describe ChatMessage::PipelineMessage do
...
@@ -42,9 +42,9 @@ describe ChatMessage::PipelineMessage do
before
do
before
do
test_commit
=
double
(
"A test commit"
,
committer:
args
[
:user
],
title:
"A test commit message"
)
test_commit
=
double
(
"A test commit"
,
committer:
args
[
:user
],
title:
"A test commit message"
)
test_project
=
double
(
"A test project"
,
test_project
=
double
(
"A test project"
,
commit_by:
test_commit
,
name:
args
[
:project
][
:name
],
web_url:
args
[
:project
][
:web_url
])
commit_by:
test_commit
,
name:
args
[
:project
][
:name
],
allow
(
test_project
).
to
receive
(
:avatar_url
).
with
(
no_args
).
and_return
(
"/avatar"
)
web_url:
args
[
:project
][
:web_url
],
avatar_url:
args
[
:project
][
:avatar_url
])
allow
(
test_project
).
to
receive
(
:avatar_url
).
with
(
only_path:
false
).
and_return
(
args
[
:project
][
:avatar_url
])
allow
(
Project
).
to
receive
(
:find
)
{
test_project
}
allow
(
Project
).
to
receive
(
:find
)
{
test_project
}
test_pipeline
=
double
(
"A test pipeline"
,
has_yaml_errors?:
has_yaml_errors
,
test_pipeline
=
double
(
"A test pipeline"
,
has_yaml_errors?:
has_yaml_errors
,
...
...
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