Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-12-01 17:51:27 +0300
committerDouwe Maan <douwe@gitlab.com>2015-12-01 17:53:32 +0300
commitf3ea06eb7f8bef748be0882cb0b4fb58deed8eef (patch)
tree42e9620a2ec0234ce20778ae40d781c2504254e8 /lib/gitlab/closing_issue_extractor.rb
parent62c14ba2edf9ac4b4bb1e8c46c0c60f1b6574909 (diff)
Autolink first so we don't pick up numeric anchors as issue references.
Diffstat (limited to 'lib/gitlab/closing_issue_extractor.rb')
-rw-r--r--lib/gitlab/closing_issue_extractor.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/closing_issue_extractor.rb b/lib/gitlab/closing_issue_extractor.rb
index 70b9943d7eb..0cf4c918736 100644
--- a/lib/gitlab/closing_issue_extractor.rb
+++ b/lib/gitlab/closing_issue_extractor.rb
@@ -2,7 +2,7 @@ module Gitlab
class ClosingIssueExtractor
ISSUE_CLOSING_REGEX = begin
pattern = Gitlab.config.gitlab.issue_closing_pattern
- pattern = pattern.sub('%{issue_ref}', "(?:#{Issue.reference_pattern})")
+ pattern = pattern.sub('%{issue_ref}', "(?:(?:#{Issue.link_reference_pattern})|(?:#{Issue.reference_pattern}))")
Regexp.new(pattern).freeze
end