From b4f8a768cfc850101bcc95d0244f90f836a43e59 Mon Sep 17 00:00:00 2001 From: Danilo Pianini Date: Thu, 16 Mar 2023 13:21:26 +0100 Subject: [PATCH] ci(mergify): disable auto-rebasing due to Mergifyio/mergify#5074 --- .mergify.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 853178baf..0879fdbbd 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,11 +1,4 @@ pull_request_rules: - - name: Auto-rebase if appropriately labeled - conditions: - - label=auto-update-rebase - - -draft - - -conflict - actions: - rebase: - name: Auto-update with merge if appropriately labeled conditions: - label=auto-update-merge @@ -15,6 +8,9 @@ pull_request_rules: update: - name: rebase-merge working updates conditions: + - or: &authors_are_bots + - author=renovate[bot] + - author=dependabot[bot] - author=renovate[bot] - label=dependencies - -draft