From 226fbcd1bfd8b7effc2665d9c629640d9f792658 Mon Sep 17 00:00:00 2001
From: Rico Huijbers <rix0rrr@gmail.com>
Date: Mon, 18 Mar 2024 11:24:27 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=9A=20Squash=20merge=20Weblate=20PRs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We used to regular-merge Weblate PRs, which leads to a giant history
of Weblate commits in the commit history, making it hard to find
functional changes.

We weren't able to squash-merge Weblate PRs because it would easily
lead to merge conflicts.

Now that we control when Weblate pulls and creates commits, this
problem has disappeared, so we can safely squash-merge and get a nicer
history.
---
 .mergify.yml | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index 1619812e315..e067d3f861f 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -6,14 +6,13 @@ queue_rules:
         - "check-success=build"
 
 pull_request_rules:
-  - name: Automatic squash merge on approval for non-Weblate PRs
+  - name: Automatic squash merge on approval
     conditions:
         - and:
           - "#approved-reviews-by>=1"
           - "#changes-requested-reviews-by=0"
           - "check-success=build"
           - "check-success=cypress"
-          - "-author=weblate"
     actions:
       comment:
         message: Thank you for contributing! Your pull request is now going on the merge train (choo choo! Do not click update from main anymore, and be sure to [allow changes to be pushed to your fork](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork)).
@@ -24,20 +23,3 @@ pull_request_rules:
           {{ title }} (#{{number}})
           {{ body }}
 
-  - name: Automatic regular merge for Weblate PRs
-    conditions:
-        - and:
-          - "#approved-reviews-by>=1"
-          - "#changes-requested-reviews-by=0"
-          - "check-success=build"
-          - "check-success=cypress"
-          - "author=weblate"
-    actions:
-      comment:
-        message: Thanks Weblate! This pull request is going to be merged automatically.
-      queue:
-        name: default_queue
-        method: merge
-        commit_message_template: |-
-          {{ title }} (#{{number}})
-          {{ body }}