From 2a59a3e478129ce89577d890eb531016e5b83c28 Mon Sep 17 00:00:00 2001
From: Philip Offtermatt
Date: Mon, 21 Aug 2023 17:30:54 +0200
Subject: [PATCH 1/2] Remove queue from mergify config
---
.mergify.yml | 5 -----
1 file changed, 5 deletions(-)
diff --git a/.mergify.yml b/.mergify.yml
index 1c40008..c3d7575 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -4,11 +4,6 @@ defaults:
assignees:
- "{{ author }}"
-queue_rules:
- - name: default
- conditions:
- - "#approved-reviews-by>1"
-
pull_request_rules:
- name: Backport patches to the v0.37.x branch
conditions:
From 437a21e82426e229fe135af3bee2820e60aeb81f Mon Sep 17 00:00:00 2001
From: Philip Offtermatt
Date: Mon, 21 Aug 2023 17:32:47 +0200
Subject: [PATCH 2/2] Fix branch name in mergify config
---
.mergify.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.mergify.yml b/.mergify.yml
index c3d7575..5817d97 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -12,7 +12,7 @@ pull_request_rules:
actions:
backport:
branches:
- - release/v0.37.x
+ - v0.37.x
- name: Backport patches to the v0.34.x branch
conditions:
- base=main
@@ -20,4 +20,4 @@ pull_request_rules:
actions:
backport:
branches:
- - release/v0.34.x
+ - v0.34.x