Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 3 deletions

diff --git a/lib/atlassian/jira_connect/serializers/build_entity.rb b/lib/atlassian/jira_connect/serializers/build_entity.rb
index aa864cb268f..b595d0c2a92 100644
--- a/lib/atlassian/jira_connect/serializers/build_entity.rb
+++ b/lib/atlassian/jira_connect/serializers/build_entity.rb
@@ -22,9 +22,10 @@ module Atlassian
         expose :references
 
         def issue_keys
-          # extract Jira issue keys from either the source branch/ref or the
-          # merge request title.
-          @issue_keys ||= pipeline.all_merge_requests.flat_map do |mr|
+          commit_message_issue_keys = JiraIssueKeyExtractor.new(pipeline.git_commit_message).issue_keys
+
+          # extract Jira issue keys from either the source branch/ref or the merge request title.
+          @issue_keys ||= commit_message_issue_keys + pipeline.all_merge_requests.flat_map do |mr|
             src = "#{mr.source_branch} #{mr.title} #{mr.description}"
             JiraIssueKeyExtractor.new(src).issue_keys
           end.uniq