From 98ee7169e8cf6b9852ce9a2c1e14be85c9b8625e Mon Sep 17 00:00:00 2001
From: Artem Pelenitsyn <a.pelenitsyn@gmail.com>
Date: Thu, 6 Oct 2022 19:03:57 -0400
Subject: [PATCH] mergify: two-day delay should account for the squash label
---
.github/mergify.yml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/.github/mergify.yml b/.github/mergify.yml
index e8f8e0d432..ef0d8c458e 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -9,7 +9,9 @@ pull_request_rules:
name: Wait for 2 days before validating merge
conditions:
- updated-at<2 days ago
- - label=merge me
+ - or
+ - label=merge me
+ - label=squash+merge me
- '#approved-reviews-by>=2'
# rebase+merge strategy
--
GitLab