diff options
author | Marin Jankovski <marin@gitlab.com> | 2014-09-08 14:56:29 +0200 |
---|---|---|
committer | Marin Jankovski <marin@gitlab.com> | 2014-09-08 14:56:29 +0200 |
commit | 3131d0609cf402d8e92d72c4081f567e96846d15 (patch) | |
tree | 28a6aac17f373b94090405973f6687ea8862dd20 | |
parent | 494d15cfdeb714a439e0536178219fc4928421d5 (diff) | |
parent | 11b707a62e437a24056eb9525176ce88678fb5c8 (diff) | |
download | gitlab-ce-3131d0609cf402d8e92d72c4081f567e96846d15.tar.gz |
Merge pull request #7147 from zzet/patch-12
Update markdown reference to external issues
-rw-r--r-- | lib/gitlab/markdown.rb | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb index b248d8f9436..6017a4c86c1 100644 --- a/lib/gitlab/markdown.rb +++ b/lib/gitlab/markdown.rb @@ -192,8 +192,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 @@ -229,15 +233,15 @@ module Gitlab end end - def reference_jira_issue(identifier, project = @project) - url = url_for_issue(identifier) - title = Gitlab.config.issues_tracker[project.issues_tracker]["title"] + def reference_external_issue(identifier, issue_tracker, project = @project) + url = url_for_issue(identifier, project) + title = issue_tracker['title'] options = html_options.merge( title: "Issue in #{title}", class: "gfm gfm-issue #{html_options[:class]}" ) - link_to("#{identifier}", url, options) + link_to("##{identifier}", url, options) end end end |