Merge branch 'master' into add-tink

tinkerbell · Jun 22, 2020 · a315765 · a315765
2 parents 3b28589 + d8aca4c
commit a315765
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -0,0 +1,13 @@
+pull_request_rules:
+  - name: Automatic merge on approval
+    conditions:
+      - base=master
+      - "#approved-reviews-by>=1"
+      - "#review-requested=0"
+      - "#changes-requested-reviews-by=0"
+      - label=ready-to-merge
+      - label!=do-not-merge
+    actions:
+      merge:
+        commit_message: title+body
+        strict: smart+fastpath