Commit f5e38419 authored by GitLab Bot's avatar GitLab Bot

Automatic merge of gitlab-org/gitlab-ce master

parents ffa38df4 25cee3e0
...@@ -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
......
---
title: Fix project avatar image in Slack pipeline notifications
merge_request: 31788
author:
type: fixed
...@@ -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,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment