diff options
| author | Blake Hitchcock <rbhitchcock@gmail.com> | 2016-01-25 11:27:03 -0500 |
|---|---|---|
| committer | Blake Hitchcock <rbhitchcock@gmail.com> | 2016-01-26 15:55:40 -0500 |
| commit | 4be65c3231f1bc260134d1c301b24baf87ef1552 (patch) | |
| tree | d4ab7e3962fe10533dc56451d3eb5cdbdcaa5648 /app/models/external_issue.rb | |
| parent | 95c644dfa2b433e9658f7ea1e76c08bf1fcc74ab (diff) | |
| download | gitlab-ce-4be65c3231f1bc260134d1c301b24baf87ef1552.tar.gz | |
Update ExternalIssue regex for JIRA integration
The pattern in the `::reference_pattern` class method in the
ExternalIssue model does not match all valid forms of JIRA project
names. I have updated the regex to match JIRA project names with numbers
and underscores. More information on valid JIRA project names can be
found here:
https://confluence.atlassian.com/jira/changing-the-project-key-format-192534.html
* The first character must be a letter,
* All letters used in the project key must be from the Modern Roman Alphabet and upper case, and
* Only letters, numbers or the underscore character can be used.
Diffstat (limited to 'app/models/external_issue.rb')
| -rw-r--r-- | app/models/external_issue.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/external_issue.rb b/app/models/external_issue.rb index 49f6c95e045..2ca79df0a29 100644 --- a/app/models/external_issue.rb +++ b/app/models/external_issue.rb @@ -31,7 +31,7 @@ class ExternalIssue # Pattern used to extract `JIRA-123` issue references from text def self.reference_pattern - %r{(?<issue>([A-Z\-]+-)\d+)} + %r{(?<issue>\b([A-Z][A-Z0-9_]+-)\d+)} end def to_reference(_from_project = nil) |