From 95a0b34d8ff7184b6e665c3451d8cec7a2e3cbbe Mon Sep 17 00:00:00 2001
From: Ben Hearsum <bhearsum@mozilla.com>
Date: Tue, 10 Aug 2021 08:58:30 -0400
Subject: [PATCH] Backout mergify changes for bustage

---
 .mergify.yml | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index 1980de742..2940fe175 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -16,10 +16,7 @@ pull_request_rules:
         message: MickeyMoz 💪
       merge:
         method: rebase
-        # These PRs are just bumping versions, and very unlikely to break
-        # anything. It's not worth the delay of rebasing them
-        # (sometimes multiple times) before merging.
-        strict: false
+        strict: smart
   - name: L10N - Auto Merge
     conditions:
       - author=mozilla-l10n-automation-bot
@@ -31,10 +28,7 @@ pull_request_rules:
         message: LGTM 😎
       merge:
         method: rebase
-        # These PRs are just bumping versions, and very unlikely to break
-        # anything. It's not worth the delay of rebasing them
-        # (sometimes multiple times) before merging.
-        strict: false
+        strict: smart
   - name: Release automation (Old)
     conditions:
       - base~=releases[_/].*