kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Properly move over issues_tracker_id from old custom issue tracker URLs.

Browse source
This commit is contained in:
Douwe Maan 2015-03-10 14:06:15 +01:00
parent e0caed91e2
commit 76842aac75
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/models/project_services/issue_tracker_service.rb
View file

@ -60,9 +60,9 @@ class IssueTrackerService < Service
if enabled_in_gitlab_config if enabled_in_gitlab_config
self.properties = { self.properties = {
title: issues_tracker['title'], title: issues_tracker['title'],
project_url: set_project_url, project_url: add_issues_tracker_id(issues_tracker['project_url']),
issues_url: issues_tracker['issues_url'], issues_url: add_issues_tracker_id(issues_tracker['issues_url']),
new_issue_url: issues_tracker['new_issue_url'] new_issue_url: add_issues_tracker_id(issues_tracker['new_issue_url'])
} }
else else
self.properties = {} self.properties = {}
@ -111,15 +111,15 @@ class IssueTrackerService < Service
Gitlab.config.issues_tracker[to_param] Gitlab.config.issues_tracker[to_param]
end end
def set_project_url def add_issues_tracker_id(url)
if self.project if self.project
id = self.project.issues_tracker_id id = self.project.issues_tracker_id
if id if id
issues_tracker['project_url'].gsub(":issues_tracker_id", id) url = url.gsub(":issues_tracker_id", id)
end end
end end
issues_tracker['project_url'] url
end end
end end