Merge branch 'master' of github.com:gitlabhq/gitlabhq

Dmitriy Zaporozhets
2 parents c0d2b976 a7ac57a1
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
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
	@@ -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