Commit 6e961203 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #4098 from pguridi/jira

Jira - Fixed Jira Issue tracker support
parents 04cc6dd6 5ec3129e
...@@ -70,6 +70,11 @@ production: &base ...@@ -70,6 +70,11 @@ production: &base
# ## :project_id - GitLab project identifier # ## :project_id - GitLab project identifier
# ## :issues_tracker_id - Project Name or Id in external issue tracker # ## :issues_tracker_id - Project Name or Id in external issue tracker
# new_issue_url: "http://redmine.sample/projects/:issues_tracker_id/issues/new" # 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
gravatar: gravatar:
......
...@@ -7,6 +7,7 @@ module Gitlab ...@@ -7,6 +7,7 @@ module Gitlab
# Supported reference formats are: # Supported reference formats are:
# * @foo for team members # * @foo for team members
# * #123 for issues # * #123 for issues
# * #JIRA-123 for Jira issues
# * !123 for merge requests # * !123 for merge requests
# * $123 for snippets # * $123 for snippets
# * 123456 for commits # * 123456 for commits
...@@ -97,7 +98,7 @@ module Gitlab ...@@ -97,7 +98,7 @@ module Gitlab
(?<prefix>\W)? # Prefix (?<prefix>\W)? # Prefix
( # Reference ( # Reference
@(?<user>[a-zA-Z][a-zA-Z0-9_\-\.]*) # User name @(?<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 |!(?<merge_request>\d+) # MR ID
|\$(?<snippet>\d+) # Snippet ID |\$(?<snippet>\d+) # Snippet ID
|(?<commit>[\h]{6,40}) # Commit ID |(?<commit>[\h]{6,40}) # Commit ID
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment