summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Lorch <dlorch@gmail.com>2014-03-14 18:06:01 +0100
committerDaniel Lorch <dlorch@gmail.com>2014-03-14 18:08:05 +0100
commit686128cd68cfb6fc90ee32848c00826a7abe6280 (patch)
tree55608567acb7fec1481296b792ea4abb9033002f
parent17a9ecf8cf6724613b38c08040bdb786ffe30718 (diff)
downloadgitlab-ce-686128cd68cfb6fc90ee32848c00826a7abe6280.tar.gz
JIRA project identifiers may also contain dashes '-'
-rw-r--r--lib/gitlab/markdown.rb2
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