diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-09-21 17:26:41 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-09-21 17:26:41 +0000 |
| commit | 6c026c36702254f66473414c2dfbd0a7244069f6 (patch) | |
| tree | 731c361a5469fb1026e21fa8a58df191feb84080 /lib | |
| parent | 356658805765d01e52c7bec934173ffa8aaa6ada (diff) | |
| parent | a3d5c82f538062ee377609116ee585d092c13c9c (diff) | |
| download | gitlab-ce-6c026c36702254f66473414c2dfbd0a7244069f6.tar.gz | |
Merge branch 'dm-closing-issue-urls' into 'master'
Correctly detect multiple issue URLs after 'Closes...' in MR descriptions
Closes #33745
See merge request gitlab-org/gitlab-ce!14411
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/closing_issue_extractor.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/closing_issue_extractor.rb b/lib/gitlab/closing_issue_extractor.rb index 58f86abc5c4..243c1f1394d 100644 --- a/lib/gitlab/closing_issue_extractor.rb +++ b/lib/gitlab/closing_issue_extractor.rb @@ -1,7 +1,7 @@ module Gitlab class ClosingIssueExtractor ISSUE_CLOSING_REGEX = begin - link_pattern = URI.regexp(%w(http https)) + link_pattern = Banzai::Filter::AutolinkFilter::LINK_PATTERN pattern = Gitlab.config.gitlab.issue_closing_pattern pattern = pattern.sub('%{issue_ref}', "(?:(?:#{link_pattern})|(?:#{Issue.reference_pattern}))") |