From 64086f7171a023f364477376a46dc1b1ad6f3fb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Federico=20Kunze=20K=C3=BCllmer?=
 <federico.kunze94@gmail.com>
Date: Thu, 25 Nov 2021 12:01:11 +0100
Subject: [PATCH 1/2] ci: enable backport for v0.8 and v0.7

---
 clang-format => .clang-format |  0
 .mergify.yml                  | 26 +++++++++++++++++++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)
 rename clang-format => .clang-format (100%)

diff --git a/clang-format b/.clang-format
similarity index 100%
rename from clang-format
rename to .clang-format
diff --git a/.mergify.yml b/.mergify.yml
index 69eb476cc7..fd28dd6b48 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,10 +1,34 @@
+queue_rules:
+  - name: default
+    conditions:
+      - "#approved-reviews-by>1"
+
 pull_request_rules:
-  - name: automerge to base branch with label automerge and branch protection passing
+  - name: automerge to master with label automerge and branch protection passing
     conditions:
       - "#approved-reviews-by>1"
       - base=main
       - label=automerge
     actions:
+      queue:
+        name: default
       merge:
         method: squash
         strict: true
+        commit_message: title+body
+  - name: backport patches to v0.8.x branch
+    conditions:
+      - base=main
+      - label=backport/0.8.x
+    actions:
+      backport:
+        branches:
+          - release/v0.8.x
+  - name: backport patches to v0.7.x branch
+    conditions:
+      - base=main
+      - label=backport/0.7.x
+    actions:
+      backport:
+        branches:
+          - release/v0.7.x
\ No newline at end of file

From d0944539643ae1877de763e9da47963c54d2c691 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Federico=20Kunze=20K=C3=BCllmer?=
 <federico.kunze94@gmail.com>
Date: Thu, 25 Nov 2021 12:03:57 +0100
Subject: [PATCH 2/2] changelog

---
 .mergify.yml | 4 ++--
 CHANGELOG.md | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index fd28dd6b48..30bf50e8d2 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -4,7 +4,7 @@ queue_rules:
       - "#approved-reviews-by>1"
 
 pull_request_rules:
-  - name: automerge to master with label automerge and branch protection passing
+  - name: automerge to the base branch with label automerge and branch protection passing
     conditions:
       - "#approved-reviews-by>1"
       - base=main
@@ -31,4 +31,4 @@ pull_request_rules:
     actions:
       backport:
         branches:
-          - release/v0.7.x
\ No newline at end of file
+          - release/v0.7.x
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3442be0948..144c10d0fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,10 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ## Unreleased
 
+## Improvements
+
+* (ci) [tharsis#784](https://github.com/tharsis/ethermint/pull/784) Enable automatic backport of PRs.
+
 ### Bug Fixes
 
 * (feemarket) [tharsis#770](https://github.com/tharsis/ethermint/pull/770) Enable fee market (EIP1559) by default.