Merge branch 'main' into dependabot/npm_and_yarn/electron/remote-2.0.9

sircharlo · Oct 10, 2023 · c111202 · c111202
2 parents 945542a + d3a28a7
commit c111202
Show file tree

Hide file tree

Showing 3 changed files with 784 additions and 1,278 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -0,0 +1,15 @@
+pull_request_rules:
+  - name: Automatic merge for trusted authors and dependabot
+    conditions:
+      - or:
+          - author=sircharlo
+          - and:
+              - author=dependabot[bot]
+              - or:
+                 - title~=^Bump [^\s]+ from ([\d]+)\..+ to \1\.
+                 - title~=^chore\(deps\). bump [^\s]+ from ([\d]+)\..+ to \1\.
+                 - title~=^chore\(deps-dev\). bump [^\s]+ from ([\d]+)\..+ to \1\.
+    actions:
+      update:
+      merge:
+        method: squash