Commit 25cee3e0 authored by Robert Speicher's avatar Robert Speicher

Merge branch '66008-fix-project-image-in-slack-notifications' into 'master'

Fix project avatar image in Slack pipeline notifications

Closes #66008

See merge request gitlab-org/gitlab-ce!31788
parents 0abe5393 5112d92c
......@@ -68,7 +68,7 @@ module ChatMessage
title_link: pipeline_url,
fields: attachments_fields,
footer: project.name,
footer_icon: project.avatar_url,
footer_icon: project.avatar_url(only_path: false),
ts: finished_at
}]
end
......
---
title: Fix project avatar image in Slack pipeline notifications
merge_request: 31788
author:
type: fixed
......@@ -42,9 +42,9 @@ describe ChatMessage::PipelineMessage do
before do
test_commit = double("A test commit", committer: args[:user], title: "A test commit message")
test_project = double("A test project",
commit_by: test_commit, name: args[:project][:name],
web_url: args[:project][:web_url], avatar_url: args[:project][:avatar_url])
test_project = double("A test project", commit_by: test_commit, name: args[:project][:name], web_url: args[:project][:web_url])
allow(test_project).to receive(:avatar_url).with(no_args).and_return("/avatar")
allow(test_project).to receive(:avatar_url).with(only_path: false).and_return(args[:project][:avatar_url])
allow(Project).to receive(:find) { test_project }
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