home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 21:56:19 +10:00
Code Issues Packages Projects Releases Wiki Activity

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

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

Addresses https://gitlab.com/gitlab-org/gitlab-ce/issues/1124.

cc @marin Regression in 7.8.0.

See merge request !1670
This commit is contained in:
Marin Jankovski
2015-03-10 17:07:49 +00:00
parent fe14535461 76842aac75
commit 82bb3ec33d
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/models/project_services/issue_tracker_service.rb
+6 -6
View File
@@ -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