Move repetition to the parent.

3 files changed, 54 insertions, 89 deletions

diff --git a/app/models/project_services/issue_tracker_service.rb b/app/models/project_services/issue_tracker_service.rb
index 664b55a5951..7ff6e0f284d 100644
--- a/app/models/project_services/issue_tracker_service.rb
+++ b/app/models/project_services/issue_tracker_service.rb
@@ -15,4 +15,48 @@ class IssueTrackerService < Service
   def new_issue_url
     # implement inside child
   end
+
+  def fields
+    [
+      { type: 'text', name: 'description', placeholder: description },
+      { type: 'text', name: 'project_url', placeholder: 'Project url' },
+      { type: 'text', name: 'issues_url', placeholder: 'Issue url'},
+      { type: 'text', name: 'new_issue_url', placeholder: 'New Issue url'}
+    ]
+  end
+
+  def initialize_properties
+    if properties.nil?
+      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']
+        }
+      end
+    end
+  end
+
+  private
+
+  def enabled_in_gitlab_config
+    Gitlab.config.issues_tracker &&
+    Gitlab.config.issues_tracker.values.any? &&
+    issues_tracker
+  end
+
+  def issues_tracker
+    Gitlab.config.issues_tracker[to_param]
+  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/jira_service.rb b/app/models/project_services/jira_service.rb
index f8b04ddeea7..b0d668948d0 100644
--- a/app/models/project_services/jira_service.rb
+++ b/app/models/project_services/jira_service.rb
@@ -21,49 +21,4 @@ class JiraService < IssueTrackerService
   def to_param
     'jira'
   end
-
-  def fields
-    [
-      { type: 'text', name: 'title', placeholder: title },
-      { type: 'text', name: 'description', placeholder: description },
-      { type: 'text', name: 'project_url', placeholder: 'Project url' },
-      { type: 'text', name: 'issues_url', placeholder: 'Issue url'},
-      { type: 'text', name: 'new_issue_url', placeholder: 'New Issue url'}
-    ]
-  end
-
-  def initialize_properties
-    if properties.nil?
-      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']
-        }
-      end
-    end
-  end
-
-  private
-
-  def enabled_in_gitlab_config
-    Gitlab.config.issues_tracker &&
-    Gitlab.config.issues_tracker.values.any? &&
-    issues_tracker
-  end
-
-  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 71286d74b58..11cce3e0561 100644
--- a/app/models/project_services/redmine_service.rb
+++ b/app/models/project_services/redmine_service.rb
@@ -3,56 +3,22 @@ class RedmineService < IssueTrackerService
   prop_accessor :title, :description, :project_url, :issues_url, :new_issue_url
 
   def title
-    'Redmine'
+    if self.properties && self.properties['title'].present?
+      self.properties['title']
+    else
+      'Redmine'
+    end
   end
 
   def description
-    'Redmine issue tracker'
+    if self.properties && self.properties['description'].present?
+      self.properties['description']
+    else
+      'Redmine issue tracker'
+    end
   end
 
   def to_param
     'redmine'
   end
-
-  def fields
-    [
-      { type: 'text', name: 'project_url', placeholder: 'Project url' },
-      { type: 'text', name: 'issues_url', placeholder: 'Issue url'},
-      { type: 'text', name: 'new_issue_url', placeholder: 'New Issue url'}
-    ]
-  end
-
-  def initialize_properties
-    if properties.nil?
-      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']
-        }
-      end
-    end
-  end
-
-  private
-
-  def enabled_in_gitlab_config
-    Gitlab.config.issues_tracker &&
-    Gitlab.config.issues_tracker.values.any? &&
-    issues_tracker
-  end
-
-  def issues_tracker
-    Gitlab.config.issues_tracker['redmine']
-  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