From 1e7598164beb6de7035101b984d4caa8073fdc78 Mon Sep 17 00:00:00 2001 From: Andrew Kumanyaev Date: Wed, 18 Jun 2014 11:20:56 +0400 Subject: [PATCH 1/3] Update markdown reference to external issues 1. Issue may be not only in jira. 2. Rewrite method for support different external issue trackers --- lib/gitlab/markdown.rb | 12 ++++++++---- 1 file 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}", From f789f29ca63df2050c7c4975957832b0a7cdab7d Mon Sep 17 00:00:00 2001 From: Andrew Kumanyaev Date: Mon, 18 Aug 2014 11:22:11 +0400 Subject: [PATCH 2/3] Update markdown.rb Fix mistake by @qqshfox report --- lib/gitlab/markdown.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb index e90de83a9b2..bc718415f60 100644 --- a/lib/gitlab/markdown.rb +++ b/lib/gitlab/markdown.rb @@ -231,7 +231,7 @@ module Gitlab end def reference_external_issue(identifier, issue_tracker, project = @project) - url = url_for_issue(identifier) + url = url_for_issue(identifier, project) title = issue_tracker['title'] options = html_options.merge( From 11b707a62e437a24056eb9525176ce88678fb5c8 Mon Sep 17 00:00:00 2001 From: Andrew Kumanyaev Date: Wed, 20 Aug 2014 00:21:59 +0400 Subject: [PATCH 3/3] fix link_to by @bwrsandman Add missing '#' --- lib/gitlab/markdown.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb index bc718415f60..50e6b1efca6 100644 --- a/lib/gitlab/markdown.rb +++ b/lib/gitlab/markdown.rb @@ -238,7 +238,7 @@ module Gitlab title: "Issue in #{title}", class: "gfm gfm-issue #{html_options[:class]}" ) - link_to("#{identifier}", url, options) + link_to("##{identifier}", url, options) end end end