diff options
author | Sean McGivern <sean@gitlab.com> | 2019-07-25 14:18:00 +0300 |
---|---|---|
committer | Sean McGivern <sean@gitlab.com> | 2019-07-25 14:18:00 +0300 |
commit | 2dd33c0812a0935184d51d9b0f012b87a39904e3 (patch) | |
tree | 6f55c79b1dbc5f95aed343f161d0082a6c90267b | |
parent | cb41470cddf890ce85f23751f2326ea50ea9b79f (diff) | |
parent | d19717cba65ef3ae6f76ec25140ab5c255b27d42 (diff) |
Merge branch '9643-jira-api-serializer-ce' into 'master'
[CE] Create serializer for Jira API JSON payload
See merge request gitlab-org/gitlab-ce!31139
-rw-r--r-- | app/models/project_services/jira_service.rb | 2 | ||||
-rw-r--r-- | lib/gitlab/regex.rb | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/app/models/project_services/jira_service.rb b/app/models/project_services/jira_service.rb index 7ab79242cc3..d08fcd8954d 100644 --- a/app/models/project_services/jira_service.rb +++ b/app/models/project_services/jira_service.rb @@ -31,7 +31,7 @@ class JiraService < IssueTrackerService # {PROJECT-KEY}-{NUMBER} Examples: JIRA-1, PROJECT-1 def self.reference_pattern(only_long: true) - @reference_pattern ||= /(?<issue>\b([A-Z][A-Z0-9_]+-)\d+)/ + @reference_pattern ||= /(?<issue>\b#{Gitlab::Regex.jira_issue_key_regex})/ end def initialize_properties diff --git a/lib/gitlab/regex.rb b/lib/gitlab/regex.rb index e43147a3f37..21614ea003e 100644 --- a/lib/gitlab/regex.rb +++ b/lib/gitlab/regex.rb @@ -94,6 +94,12 @@ module Gitlab }mx end + # Based on Jira's project key format + # https://confluence.atlassian.com/adminjiraserver073/changing-the-project-key-format-861253229.html + def jira_issue_key_regex + @jira_issue_key_regex ||= /[A-Z][A-Z_0-9]+-\d+/ + end + def jira_transition_id_regex @jira_transition_id_regex ||= /\d+/ end |