diff --git a/.mergify.yml b/.mergify.yml index da6da3f75..2a4373276 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,9 +1,6 @@ --- defaults: actions: - # mergify.io has removed bot_account from its free open source plan. - # comment: - # bot_account: ceph-csi-bot # mergify[bot] will be commenting. queue: # merge_bot_account: ceph-csi-bot #mergify[bot] will be merging prs. # update_bot_account: ceph-csi-bot #mergify will randomly pick and use @@ -12,6 +9,9 @@ defaults: method: rebase rebase_fallback: merge update_method: rebase + rebase: + # Use ceph-csi-bot for rebasing, not the account of the PR owner. + bot_account: ceph-csi-bot queue_rules: - name: default