Merge branch '214777-match-jira-keys-with-trailing-characters' into 'master'

Match Jira keys with trailing characters

Closes #214777

See merge request gitlab-org/gitlab!29953

changelogs/unreleased/214777-match-jira-keys-with-trailing-characters.yml

+---
+title: Match Jira keys with trailing characters
+merge_request: 29953
+author:
+type: fixed

lib/gitlab/regex.rb

@@ -121,7 +121,7 @@ module Gitlab
     # 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+\b/
+      @jira_issue_key_regex ||= /[A-Z][A-Z_0-9]+-\d+/
     end
 
     def jira_transition_id_regex

spec/models/project_services/jira_service_spec.rb

@@ -69,11 +69,23 @@ describe JiraService do
   end
 
   describe '.reference_pattern' do
-    it_behaves_like 'allows project key on reference pattern'
+    using RSpec::Parameterized::TableSyntax
 
-    it 'does not allow # on the code' do
-      expect(described_class.reference_pattern.match('#123')).to be_nil
-      expect(described_class.reference_pattern.match('1#23#12')).to be_nil
+    where(:key, :result) do
+      '#123'               | ''
+      '1#23#12'            | ''
+      'JIRA-1234A'         | 'JIRA-1234'
+      'JIRA-1234-some_tag' | 'JIRA-1234'
+      'JIRA-1234_some_tag' | 'JIRA-1234'
+      'EXT_EXT-1234'       | 'EXT_EXT-1234'
+      'EXT3_EXT-1234'      | 'EXT3_EXT-1234'
+      '3EXT_EXT-1234'      | ''
+    end
+
+    with_them do
+      specify do
+        expect(described_class.reference_pattern.match(key).to_s).to eq(result)
+      end
     end
   end