Commit a7ac57a1a33652675b0fe46e869c6fa6e1686ca4
Exists in
spb-stable
and in
3 other branches
Merge pull request #6534 from dlorch/master
JIRA project identifiers may also contain dashes '-'
Showing
1 changed file
with
1 additions
and
1 deletions
Show diff stats
lib/gitlab/markdown.rb
| @@ -98,7 +98,7 @@ module Gitlab | @@ -98,7 +98,7 @@ module Gitlab | ||
| 98 | (?<prefix>\W)? # Prefix | 98 | (?<prefix>\W)? # Prefix |
| 99 | ( # Reference | 99 | ( # Reference |
| 100 | @(?<user>[a-zA-Z][a-zA-Z0-9_\-\.]*) # User name | 100 | @(?<user>[a-zA-Z][a-zA-Z0-9_\-\.]*) # User name |
| 101 | - |\#(?<issue>([a-zA-Z]+-)?\d+) # Issue ID | 101 | + |\#(?<issue>([a-zA-Z\-]+-)?\d+) # Issue ID |
| 102 | |!(?<merge_request>\d+) # MR ID | 102 | |!(?<merge_request>\d+) # MR ID |
| 103 | |\$(?<snippet>\d+) # Snippet ID | 103 | |\$(?<snippet>\d+) # Snippet ID |
| 104 | |(?<commit>[\h]{6,40}) # Commit ID | 104 | |(?<commit>[\h]{6,40}) # Commit ID |