diff --git a/.github/mergify.yml b/.github/mergify.yml index 8a08374..bd4d41d 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -1,12 +1,4 @@ --- -defaults: - actions: - queue: - name: default - method: rebase - update_method: rebase - - # each test should be listed separately, do not use regular expressions: # https://docs.mergify.io/conditions.html#validating-all-status-check # TODO: Use mergify's recently added 'shared configuration support' @@ -41,6 +33,8 @@ queue_rules: - check-success=test-ad-server-kubernetes (nightly, centos, amd64) - check-success=test-ad-server-kubernetes (nightly, fedora, amd64) - check-success=dpulls + merge_method: rebase + update_method: rebase pull_request_rules: