diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-03-17 13:28:39 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-03-17 13:28:39 +0200 |
| commit | a7ac57a1a33652675b0fe46e869c6fa6e1686ca4 (patch) | |
| tree | 17936083bd5037e72826d8f5ee86860bb9d18466 | |
| parent | 36c094b08dc37887050eedad7f0fb4f05e79f9cc (diff) | |
| parent | 686128cd68cfb6fc90ee32848c00826a7abe6280 (diff) | |
| download | gitlab-ce-a7ac57a1a33652675b0fe46e869c6fa6e1686ca4.tar.gz | |
Merge pull request #6534 from dlorch/master
JIRA project identifiers may also contain dashes '-'
| -rw-r--r-- | lib/gitlab/markdown.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb index dc9c0e0ab2c..e72f4f5d0ce 100644 --- a/lib/gitlab/markdown.rb +++ b/lib/gitlab/markdown.rb @@ -98,7 +98,7 @@ module Gitlab (?<prefix>\W)? # Prefix ( # Reference @(?<user>[a-zA-Z][a-zA-Z0-9_\-\.]*) # User name - |\#(?<issue>([a-zA-Z]+-)?\d+) # Issue ID + |\#(?<issue>([a-zA-Z\-]+-)?\d+) # Issue ID |!(?<merge_request>\d+) # MR ID |\$(?<snippet>\d+) # Snippet ID |(?<commit>[\h]{6,40}) # Commit ID |