summaryrefslogtreecommitdiff
path: root/lib/gitlab/markdown.rb
diff options
context:
space:
mode:
authorVinnie Okada <vokada@mrvinn.com>2014-10-05 10:12:53 -0500
committerVinnie Okada <vokada@mrvinn.com>2014-10-05 10:12:53 -0500
commitbcf88c85597d8a40a209f4aa24cd6015f66d97c6 (patch)
tree3677d7ee6d68048685d301b8447e35c425ea1bdc /lib/gitlab/markdown.rb
parent088987e2dd4b7ad8d62ebd34448dbe194df7812d (diff)
downloadgitlab-ce-bcf88c85597d8a40a209f4aa24cd6015f66d97c6.tar.gz
Fix external issue links
Display the project path in links to issues in other projects that use an external issue tracker.
Diffstat (limited to 'lib/gitlab/markdown.rb')
-rw-r--r--lib/gitlab/markdown.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb
index 51c33f7cb1d..9b3e34653af 100644
--- a/lib/gitlab/markdown.rb
+++ b/lib/gitlab/markdown.rb
@@ -210,7 +210,8 @@ module Gitlab
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)
+ reference_external_issue(identifier, external_issue_tracker, project,
+ prefix_text)
end
end
end
@@ -253,7 +254,7 @@ module Gitlab
end
def reference_external_issue(identifier, issue_tracker, project = @project,
- _ = nil)
+ prefix_text = nil)
url = url_for_issue(identifier, project)
title = issue_tracker['title']
@@ -261,7 +262,7 @@ module Gitlab
title: "Issue in #{title}",
class: "gfm gfm-issue #{html_options[:class]}"
)
- link_to("##{identifier}", url, options)
+ link_to("#{prefix_text}##{identifier}", url, options)
end
end
end