diff options
author | Arturo Herrero <arturo.herrero@gmail.com> | 2019-09-11 17:59:45 +0100 |
---|---|---|
committer | Arturo Herrero <arturo.herrero@gmail.com> | 2019-09-11 17:59:45 +0100 |
commit | 8d3e54a1da5e9921a6800b175143c4785fe06100 (patch) | |
tree | cd7da3c15587a3e756ccc04b2fc4d20b4104e3d0 | |
parent | 1a5c262a742c0a077036c6cff2b6078fae5093c9 (diff) | |
download | gitlab-ce-jira-favicon-link.tar.gz |
JIRA integration: Fix favicon imagejira-favicon-link
-rw-r--r-- | app/models/project_services/jira_service.rb | 2 | ||||
-rw-r--r-- | changelogs/unreleased/jira-favicon-link.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/models/project_services/jira_service.rb b/app/models/project_services/jira_service.rb index 0728c83005e..01335bb0e3a 100644 --- a/app/models/project_services/jira_service.rb +++ b/app/models/project_services/jira_service.rb @@ -285,7 +285,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) } } } diff --git a/changelogs/unreleased/jira-favicon-link.yml b/changelogs/unreleased/jira-favicon-link.yml new file mode 100644 index 00000000000..cc8cf4b4aac --- /dev/null +++ b/changelogs/unreleased/jira-favicon-link.yml @@ -0,0 +1,5 @@ +--- +title: 'JIRA integration: Fix favicon image' +merge_request: +author: Arturo Herrero +type: fixed |