mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-23 19:46:12 +10:00
Changed regex to support Jira issue numbering format
Jira issues numbering format are like: "PROJECT-1234". Changed the regular expression to support Jira issues linking, in addition to the normal #123. Added Jira Issue tracker configuration example
This commit is contained in:
committed by
Pedro Guridi
parent
9351a295c1
commit
5ec3129ea6
@@ -70,6 +70,11 @@ production: &base
|
||||
# ## :project_id - GitLab project identifier
|
||||
# ## :issues_tracker_id - Project Name or Id in external issue tracker
|
||||
# new_issue_url: "http://redmine.sample/projects/:issues_tracker_id/issues/new"
|
||||
#
|
||||
# jira:
|
||||
# project_url: "http://jira.sample/issues/?jql=project=:issues_tracker_id"
|
||||
# issues_url: "http://jira.sample/browse/:id"
|
||||
# new_issue_url: "http://jira.sample/secure/CreateIssue.jspa"
|
||||
|
||||
## Gravatar
|
||||
gravatar:
|
||||
|
||||
@@ -7,6 +7,7 @@ module Gitlab
|
||||
# Supported reference formats are:
|
||||
# * @foo for team members
|
||||
# * #123 for issues
|
||||
# * #JIRA-123 for Jira issues
|
||||
# * !123 for merge requests
|
||||
# * $123 for snippets
|
||||
# * 123456 for commits
|
||||
@@ -97,7 +98,7 @@ module Gitlab
|
||||
(?<prefix>\W)? # Prefix
|
||||
( # Reference
|
||||
@(?<user>[a-zA-Z][a-zA-Z0-9_\-\.]*) # User name
|
||||
|\#(?<issue>\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
|
||||
|
||||
Reference in New Issue
Block a user