From 514c791dafdc68164e2be6b413ecb62240a32ff5 Mon Sep 17 00:00:00 2001 From: Danilo Pianini Date: Thu, 16 Mar 2023 10:39:42 +0100 Subject: [PATCH] ci(mergify): disable auto-rebasing due to Mergifyio/mergify#5074 --- .mergify.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 853178baff..dc5a980598 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,7 +8,9 @@ pull_request_rules: update: - name: rebase-merge working updates conditions: - - author=renovate[bot] + - or: &authors_are_bots + - author=renovate[bot] + - author=dependabot[bot] - label=dependencies - -draft - -conflict