diff options
| author | Marin Jankovski <maxlazio@gmail.com> | 2015-01-23 09:14:45 -0800 |
|---|---|---|
| committer | Marin Jankovski <maxlazio@gmail.com> | 2015-01-23 09:14:45 -0800 |
| commit | 737f6516e697ec5876fcdeb55acedfeefd24c9cc (patch) | |
| tree | 416fa73869c2052ff72014adb595e49d3de062ae /app/models/project_services | |
| parent | e9d6d1e51afa9f46f19748977739f7d2c078b84f (diff) | |
| download | gitlab-ce-737f6516e697ec5876fcdeb55acedfeefd24c9cc.tar.gz | |
Update new services with initialization based on existing data.
Diffstat (limited to 'app/models/project_services')
| -rw-r--r-- | app/models/project_services/custom_issue_tracker_service.rb | 2 | ||||
| -rw-r--r-- | app/models/project_services/jira_service.rb | 12 | ||||
| -rw-r--r-- | app/models/project_services/redmine_service.rb | 11 |
3 files changed, 22 insertions, 3 deletions
diff --git a/app/models/project_services/custom_issue_tracker_service.rb b/app/models/project_services/custom_issue_tracker_service.rb index 69e1b204bac..2476b62da89 100644 --- a/app/models/project_services/custom_issue_tracker_service.rb +++ b/app/models/project_services/custom_issue_tracker_service.rb @@ -19,7 +19,7 @@ class CustomIssueTrackerService < IssueTrackerService end def to_param - title.parameterize + 'custom_issue_tracker' end def fields diff --git a/app/models/project_services/jira_service.rb b/app/models/project_services/jira_service.rb index f83f01c55b4..f8b04ddeea7 100644 --- a/app/models/project_services/jira_service.rb +++ b/app/models/project_services/jira_service.rb @@ -37,7 +37,7 @@ class JiraService < IssueTrackerService if enabled_in_gitlab_config self.properties = { title: issues_tracker['title'], - project_url: issues_tracker['project_url'], + project_url: set_project_url, issues_url: issues_tracker['issues_url'], new_issue_url: issues_tracker['new_issue_url'] } @@ -56,4 +56,14 @@ class JiraService < IssueTrackerService def issues_tracker Gitlab.config.issues_tracker['jira'] end + + def set_project_url + id = self.project.issues_tracker_id + + if id + issues_tracker['project_url'].gsub(":issues_tracker_id", id) + else + issues_tracker['project_url'] + end + end end diff --git a/app/models/project_services/redmine_service.rb b/app/models/project_services/redmine_service.rb index 55841b50055..03f7115d84e 100644 --- a/app/models/project_services/redmine_service.rb +++ b/app/models/project_services/redmine_service.rb @@ -27,7 +27,7 @@ class RedmineService < IssueTrackerService if enabled_in_gitlab_config self.properties = { title: issues_tracker['title'], - project_url: issues_tracker['project_url'], + project_url: set_project_url, issues_url: issues_tracker['issues_url'], new_issue_url: issues_tracker['new_issue_url'] } @@ -46,4 +46,13 @@ class RedmineService < IssueTrackerService def issues_tracker Gitlab.config.issues_tracker['redmine'] end + + def set_project_url + id = self.project.issue_tracker_id + if id + issues_tracker['project_url'].gsub(":issue_tracker_id", id) + else + issues_tracker['project_url'] + end + end end |