diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2018-11-06 20:12:20 +0300 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2018-11-06 20:12:20 +0300 |
| commit | 3301876bcce517ce233893004012606ffef070a2 (patch) | |
| tree | 13d70feb4f026e7d0d61d8cd5ead70439f41237d /app/models/project_services | |
| parent | ea3b8864e8f4d577e7f06ccaa7d9bac30be162d9 (diff) | |
| parent | 9de175bfff747dd490c1b18a73ef9f04321e9806 (diff) | |
Merge branch 'allow_single_letter_external_issue_ids' into 'master'
Allow single letter external issue IDs
Closes #52803
See merge request gitlab-org/gitlab-ce!22717
Diffstat (limited to 'app/models/project_services')
| -rw-r--r-- | app/models/project_services/issue_tracker_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/project_services/issue_tracker_service.rb b/app/models/project_services/issue_tracker_service.rb index 7cff0e30e8d..a399982e5ec 100644 --- a/app/models/project_services/issue_tracker_service.rb +++ b/app/models/project_services/issue_tracker_service.rb @@ -12,9 +12,9 @@ class IssueTrackerService < Service # overridden patterns. See ReferenceRegexes::EXTERNAL_PATTERN def self.reference_pattern(only_long: false) if only_long - /(\b[A-Z][A-Z0-9_]+-)(?<issue>\d+)/ + /(\b[A-Z][A-Z0-9_]*-)(?<issue>\d+)/ else - /(\b[A-Z][A-Z0-9_]+-|#{Issue.reference_prefix})(?<issue>\d+)/ + /(\b[A-Z][A-Z0-9_]*-|#{Issue.reference_prefix})(?<issue>\d+)/ end end |