Commit 147ad7a8 authored by Dmytro Zaporozhets's avatar Dmytro Zaporozhets

Merge branch '24818-fix-jira-favicon-link' into 'master'

Fix Jira integration favicon image with relative URL

See merge request !16802
parents 721bccd9 5ad92646
Pipeline #82966973 passed with stages
in 43 minutes and 37 seconds
......@@ -298,7 +298,7 @@ class JiraService < IssueTrackerService
title: title,
status: status,
icon: {
title: 'GitLab', url16x16: asset_url(Gitlab::Favicon.main, host: gitlab_config.url)
title: 'GitLab', url16x16: asset_url(Gitlab::Favicon.main, host: gitlab_config.base_url)
}
}
}
......
---
title: Fix Jira integration favicon image with relative URL
merge_request: 16802
author:
type: fixed
......@@ -650,7 +650,7 @@ describe JiraService do
end
end
describe 'favicon urls', :request_store do
describe 'favicon urls' do
it 'includes the standard favicon' do
props = described_class.new.send(:build_remote_link_props, url: 'http://example.com', title: 'title')
expect(props[:object][:icon][:url16x16]).to match %r{^http://localhost/assets/favicon(?:-\h+).png$}
......
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