Download as
Browse Code »

Commit 6e96120337099315f65a572a70f239eedd6d98e0

Authored by Dmitriy Zaporozhets
2 parents 04cc6dd6 5ec3129e
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #4098 from pguridi/jira 

Jira - Fixed Jira Issue tracker support
Showing 2 changed files with 7 additions and 1 deletions   Show diff stats
config/gitlab.yml.example
  Diff comments   View file @6e96120
... ... @@ -70,6 +70,11 @@ production: &base
70 70 # ## :project_id - GitLab project identifier
71 71 # ## :issues_tracker_id - Project Name or Id in external issue tracker
72 72 # new_issue_url: "http://redmine.sample/projects/:issues_tracker_id/issues/new"
  73 + #
  74 + # jira:
  75 + # project_url: "http://jira.sample/issues/?jql=project=:issues_tracker_id"
  76 + # issues_url: "http://jira.sample/browse/:id"
  77 + # new_issue_url: "http://jira.sample/secure/CreateIssue.jspa"
73 78  
74 79 ## Gravatar
75 80 gravatar:
... ...
lib/gitlab/markdown.rb
  Diff comments   View file @6e96120
... ... @@ -7,6 +7,7 @@ module Gitlab
7 7 # Supported reference formats are:
8 8 # * @foo for team members
9 9 # * #123 for issues
  10 + # * #JIRA-123 for Jira issues
10 11 # * !123 for merge requests
11 12 # * $123 for snippets
12 13 # * 123456 for commits
... ... @@ -97,7 +98,7 @@ module Gitlab
97 98 (?<prefix>\W)? # Prefix
98 99 ( # Reference
99 100 @(?<user>[a-zA-Z][a-zA-Z0-9_\-\.]*) # User name
100   - |\#(?<issue>\d+) # Issue ID
  101 + |\#(?<issue>([a-zA-Z]+-)?\d+) # Issue ID
101 102 |!(?<merge_request>\d+) # MR ID
102 103 |\$(?<snippet>\d+) # Snippet ID
103 104 |(?<commit>[\h]{6,40}) # Commit ID
... ...