Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43

2 files changed, 7 insertions, 7 deletions

diff --git a/lib/atlassian/jira_connect/client.rb b/lib/atlassian/jira_connect/client.rb
index 6f87b7b7d3c..ea83076c49b 100644
--- a/lib/atlassian/jira_connect/client.rb
+++ b/lib/atlassian/jira_connect/client.rb
@@ -141,9 +141,9 @@ module Atlassian
       def user_notes_count(merge_requests)
         return unless merge_requests
 
-        Note.count_for_collection(merge_requests.map(&:id), 'MergeRequest').map do |count_group|
+        Note.count_for_collection(merge_requests.map(&:id), 'MergeRequest').to_h do |count_group|
           [count_group.noteable_id, count_group.count]
-        end.to_h
+        end
       end
 
       def jwt_token(http_method, uri)
diff --git a/lib/atlassian/jira_connect/serializers/build_entity.rb b/lib/atlassian/jira_connect/serializers/build_entity.rb
index 8372d2a62da..a3434c529a4 100644
--- a/lib/atlassian/jira_connect/serializers/build_entity.rb
+++ b/lib/atlassian/jira_connect/serializers/build_entity.rb
@@ -25,11 +25,11 @@ module Atlassian
           # extract Jira issue keys from either the source branch/ref or the
           # merge request title.
           @issue_keys ||= begin
-                            pipeline.all_merge_requests.flat_map do |mr|
-                              src = "#{mr.source_branch} #{mr.title}"
-                              JiraIssueKeyExtractor.new(src).issue_keys
-                            end.uniq
-                          end
+            pipeline.all_merge_requests.flat_map do |mr|
+              src = "#{mr.source_branch} #{mr.title}"
+              JiraIssueKeyExtractor.new(src).issue_keys
+            end.uniq
+          end
         end
 
         private