From 8d3e54a1da5e9921a6800b175143c4785fe06100 Mon Sep 17 00:00:00 2001
From: Arturo Herrero <arturo.herrero@gmail.com>
Date: Wed, 11 Sep 2019 17:59:45 +0100
Subject: JIRA integration: Fix favicon image

---
 app/models/project_services/jira_service.rb | 2 +-
 changelogs/unreleased/jira-favicon-link.yml | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/unreleased/jira-favicon-link.yml

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
-- 
cgit v1.2.1