From fd10b632740e441354c4547a12727c29dd288239 Mon Sep 17 00:00:00 2001
From: Jimmy Chen <jimmy@sigmaprime.io>
Date: Fri, 5 Sep 2025 07:54:30 +1000
Subject: [PATCH 1/2] Add co-author to mergify commits (#7993)

* Add co-author to mergify commits.

* Remove unnecessary pull request rules from mergify config.

* Revert automation removals
---
 .github/mergify.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/mergify.yml b/.github/mergify.yml
index 4ab73bcf07..0b917b2546 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -105,6 +105,10 @@ queue_rules:
 
 
         {{ body | get_section("## Proposed Changes", "") }}
+      
+      {% for commit in commits | unique(attribute='email_author') %}
+      Co-Authored-By: {{ commit.author }} <{{ commit.email_author }}>
+      {% endfor %}
     queue_conditions:
       - "#approved-reviews-by >= 1"
       - "check-success=license/cla"

From 3cb7e59be2ebcf66836dabae2c771b455822f654 Mon Sep 17 00:00:00 2001
From: Jimmy Chen <jimmy@sigmaprime.io>
Date: Thu, 18 Sep 2025 11:17:31 +1000
Subject: [PATCH 2/2] Update issue template (#7938)

* Update issue template

* Delete old issue template
---
 .../default-issue-template.md}                           | 9 +++++++++
 1 file changed, 9 insertions(+)
 rename .github/{ISSUE_TEMPLATE.md => ISSUE_TEMPLATE/default-issue-template.md} (79%)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE/default-issue-template.md
similarity index 79%
rename from .github/ISSUE_TEMPLATE.md
rename to .github/ISSUE_TEMPLATE/default-issue-template.md
index d73b9ff6f0..784add20f3 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE/default-issue-template.md
@@ -1,3 +1,12 @@
+---
+name: Default issue template
+about: Use this template for all issues
+title: ''
+labels: ''
+assignees: ''
+
+---
+
 ## Description
 
 Please provide a brief description of the issue.