From: Dimitri Savineau <dsavinea@redhat.com>
Date: Tue, 9 Jun 2020 13:23:04 +0000 (-0400)
Subject: mergify: remove merge on skip ci
X-Git-Tag: v6.0.0alpha2~175
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2f17f366385a6179591a8267a3563ecbe0367e1d;p=ceph-ansible.git

mergify: remove merge on skip ci

This rule will probably never be applyied and at the moment this is
creating a cancelled job in the CI status.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
---

diff --git a/.mergify.yml b/.mergify.yml
index fff74b55a..fa6fc056d 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,16 +1,4 @@
 pull_request_rules:
-  - name: automatic merge on skip ci
-    conditions:
-      - label!=DNM
-      - title~=\[skip ci\]
-      - '#approved-reviews-by>=2'
-    actions:
-      merge:
-        method: rebase
-        rebase_fallback: merge
-        strict: smart
-      dismiss_reviews: {}
-      delete_head_branch: {}
 # Backports
   - actions:
       backport: