diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-03-06 00:31:01 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-03-06 00:31:01 +0300 |
| commit | 6fdc09c7a766b1608a5d5b228af3c1d4f7a03b1a (patch) | |
| tree | edf772a157b6c130fd86dbe750dd633cc36eee30 /app/models/project_services | |
| parent | fd09e66194432ede8bf6568c13e6ce2d65f400e1 (diff) | |
| parent | 36a0f6aaa3d3999d743fc11a39a9f8dd2f127d70 (diff) | |
Merge branch 'issue_31081' into 'master'
Use host URL to build JIRA remote link icon
Closes #31081
See merge request gitlab-org/gitlab-ce!17541
Diffstat (limited to 'app/models/project_services')
| -rw-r--r-- | app/models/project_services/jira_service.rb | 6 |
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 |