summaryrefslogtreecommitdiff
path: root/app/models/project_services/jira_service.rb
diff options
context:
space:
mode:
authorFelipe Artur <felipefac@gmail.com>2018-03-05 16:32:51 -0300
committerFelipe Artur <felipefac@gmail.com>2018-03-05 17:20:54 -0300
commit36a0f6aaa3d3999d743fc11a39a9f8dd2f127d70 (patch)
treeb8d2ab774b910b68f70e8aa94c3df08871de1b94 /app/models/project_services/jira_service.rb
parent5656a1d608aa6c1ab703e8051bd460efe92dc5de (diff)
downloadgitlab-ce-36a0f6aaa3d3999d743fc11a39a9f8dd2f127d70.tar.gz
Use host URL to build JIRA remote link icon
Diffstat (limited to 'app/models/project_services/jira_service.rb')
-rw-r--r--app/models/project_services/jira_service.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/models/project_services/jira_service.rb b/app/models/project_services/jira_service.rb
index 436a870b0c4..e5035c81df0 100644
--- a/app/models/project_services/jira_service.rb
+++ b/app/models/project_services/jira_service.rb
@@ -1,5 +1,7 @@
class JiraService < IssueTrackerService
include Gitlab::Routing
+ include ApplicationHelper
+ include ActionView::Helpers::AssetUrlHelper
validates :url, url: true, presence: true, if: :activated?
validates :api_url, url: true, allow_blank: true
@@ -268,7 +270,9 @@ class JiraService < IssueTrackerService
url: url,
title: title,
status: status,
- icon: { title: 'GitLab', url16x16: 'https://gitlab.com/favicon.ico' }
+ icon: {
+ title: 'GitLab', url16x16: asset_url('favicon.ico', host: gitlab_config.url)
+ }
}
}
end