diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-02 18:48:39 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-02 18:48:39 +0100 |
| commit | 044e0e33dce9371430a3c91e63f9f687b536d35b (patch) | |
| tree | 77f5445c8621af79833c15c979726f82daf958ea /lib/gitlab/closing_issue_extractor.rb | |
| parent | 60828ab40ef4276b63146259f6f11333366dff6f (diff) | |
| download | gitlab-ce-044e0e33dce9371430a3c91e63f9f687b536d35b.tar.gz | |
Allow invalid URLs in closing pattern
Diffstat (limited to 'lib/gitlab/closing_issue_extractor.rb')
| -rw-r--r-- | lib/gitlab/closing_issue_extractor.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/closing_issue_extractor.rb b/lib/gitlab/closing_issue_extractor.rb index 0cf4c918736..9bef9037ad6 100644 --- a/lib/gitlab/closing_issue_extractor.rb +++ b/lib/gitlab/closing_issue_extractor.rb @@ -1,8 +1,10 @@ module Gitlab class ClosingIssueExtractor ISSUE_CLOSING_REGEX = begin + link_pattern = URI.regexp(%w(http https)) + pattern = Gitlab.config.gitlab.issue_closing_pattern - pattern = pattern.sub('%{issue_ref}', "(?:(?:#{Issue.link_reference_pattern})|(?:#{Issue.reference_pattern}))") + pattern = pattern.sub('%{issue_ref}', "(?:(?:#{link_pattern})|(?:#{Issue.reference_pattern}))") Regexp.new(pattern).freeze end |