From df47c41921a94ac06669488689a5fab0ef448d94 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 6 Dec 2021 13:34:05 -0800
Subject: [PATCH] Update Mergify configuration. (backport #7388) (#7390)

Per https://docs.mergify.com/actions/merge/#commit-message, the
commit_message option is deprecated and will be removed in 2022.
Replace it with the template suggested here:

https://docs.mergify.com/actions/queue/

(cherry picked from commit 02d456b8b8274088e8d3c6e1714263a47ffe13ac)
---
 .github/mergify.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/mergify.yml b/.github/mergify.yml
index 6641991a7..18d28bf67 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -13,4 +13,7 @@ pull_request_rules:
       queue:
         method: squash
         name: default
-        commit_message: title+body
+        commit_message_template: |
+          {{ title }} (#{{ number }})
+
+          {{ body }}