From c493689e84eadf2f9c055d9f2ce688d8d0b1b291 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 23 Aug 2024 14:55:54 +0200
Subject: [PATCH] Change output format of `repo:changelog` task (#31546)

---
 lib/tasks/repo.rake | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/lib/tasks/repo.rake b/lib/tasks/repo.rake
index 1ed1ee5c32..b90b48934e 100644
--- a/lib/tasks/repo.rake
+++ b/lib/tasks/repo.rake
@@ -49,24 +49,32 @@ namespace :repo do
       File.open(path, 'r') do |file|
         file.each_line do |line|
           if line.start_with?('-')
-            new_line = line.gsub(/[(]#([[:digit:]]+)[)]\Z/) do |pull_request_reference|
-              pull_request_number = pull_request_reference[2..-2]
+            new_line = line.gsub(/\(#([[:digit:]]+)(, #([[:digit:]]+))*\)\Z/) do |pull_requests_string|
+              pull_requests = pull_requests_string[1...-1].split(',').map { |pr_id| pr_id.strip[1...] }
               response = nil
 
-              loop do
-                response = HTTP.headers('Authorization' => "token #{ENV['GITHUB_API_TOKEN']}").get("https://api.github.com/repos/#{REPOSITORY_NAME}/pulls/#{pull_request_number}")
+              authors = pull_requests.map do |pull_request_number|
+                response = nil
 
-                if response.code == 403
-                  sleep_for = (response.headers['X-RateLimit-Reset'].to_i - Time.now.to_i).abs
-                  puts "Sleeping for #{sleep_for} seconds to get over rate limit"
-                  sleep sleep_for
-                else
-                  break
+                loop do
+                  response = HTTP.headers('Authorization' => "token #{ENV['GITHUB_API_TOKEN']}").get("https://api.github.com/repos/#{REPOSITORY_NAME}/pulls/#{pull_request_number}")
+
+                  if response.code == 403
+                    sleep_for = (response.headers['X-RateLimit-Reset'].to_i - Time.now.to_i).abs
+                    puts "Sleeping for #{sleep_for} seconds to get over rate limit"
+                    sleep sleep_for
+                  else
+                    break
+                  end
                 end
+
+                pull_request = Oj.load(response.to_s)
+                pull_request['user']['login']
               end
 
-              pull_request = Oj.load(response.to_s)
-              "([#{pull_request['user']['login']}](#{pull_request['html_url']}))"
+              authors.sort!.uniq!
+
+              "(#{pull_requests.map { |pr| "##{pr}" }.to_sentence} by #{authors.map { |author| "@#{author}" }.to_sentence})"
             end
 
             tmp.puts new_line