Commit 82bb3ec3 by Marin Jankovski

Merge branch 'issues-tracker-id' into 'master'

Properly move over `issues_tracker_id` from old custom issue tracker URLs.

Addresses #1124.

cc @marin Regression in 7.8.0.

See merge request !1670
parents fe145354 76842aac
......@@ -60,9 +60,9 @@ class IssueTrackerService < Service
if enabled_in_gitlab_config
self.properties = {
title: issues_tracker['title'],
project_url: set_project_url,
issues_url: issues_tracker['issues_url'],
new_issue_url: issues_tracker['new_issue_url']
project_url: add_issues_tracker_id(issues_tracker['project_url']),
issues_url: add_issues_tracker_id(issues_tracker['issues_url']),
new_issue_url: add_issues_tracker_id(issues_tracker['new_issue_url'])
}
else
self.properties = {}
......@@ -111,15 +111,15 @@ class IssueTrackerService < Service
Gitlab.config.issues_tracker[to_param]
end
def set_project_url
def add_issues_tracker_id(url)
if self.project
id = self.project.issues_tracker_id
if id
issues_tracker['project_url'].gsub(":issues_tracker_id", id)
url = url.gsub(":issues_tracker_id", id)
end
end
issues_tracker['project_url']
url
end
end
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