summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Kumanyaev <me@zzet.org>2014-06-18 11:20:56 +0400
committerAndrew Kumanyaev <me@zzet.org>2014-06-23 19:28:03 +0400
commit1e7598164beb6de7035101b984d4caa8073fdc78 (patch)
tree910ac140e1e8615cda4cfefaf693022b1e9b1188
parent550f2337a75abc7cdf93c3c86eaa803c52a2b1eb (diff)
downloadgitlab-ce-1e7598164beb6de7035101b984d4caa8073fdc78.tar.gz
Update markdown reference to external issues
1. Issue may be not only in jira. 2. Rewrite method for support different external issue trackers
-rw-r--r--lib/gitlab/markdown.rb12
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb
index c04be788f07..e90de83a9b2 100644
--- a/lib/gitlab/markdown.rb
+++ b/lib/gitlab/markdown.rb
@@ -189,8 +189,12 @@ module Gitlab
link_to("##{identifier}", url, options)
end
- elsif project.issues_tracker == 'jira'
- reference_jira_issue(identifier, project)
+ else
+ config = Gitlab.config
+ external_issue_tracker = config.issues_tracker[project.issues_tracker]
+ if external_issue_tracker.present?
+ reference_external_issue(identifier, external_issue_tracker, project)
+ end
end
end
@@ -226,9 +230,9 @@ module Gitlab
end
end
- def reference_jira_issue(identifier, project = @project)
+ def reference_external_issue(identifier, issue_tracker, project = @project)
url = url_for_issue(identifier)
- title = Gitlab.config.issues_tracker[project.issues_tracker]["title"]
+ title = issue_tracker['title']
options = html_options.merge(
title: "Issue in #{title}",