Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ pull_request_rules:

- name: Keep imgbot image optimizations current on develop
conditions:
- author=imgbot[bot]
# ImgBot has used both identities here, so keep both to avoid breaking auto-merge.
- author~=^(imgbot\[bot\]|app/imgbot)$
- base=develop
- -draft
- -conflict
Expand All @@ -48,7 +49,8 @@ pull_request_rules:

- name: Auto-merge imgbot image optimizations on develop
conditions:
- author=imgbot[bot]
# ImgBot has used both identities here, so keep both to avoid breaking auto-merge.
- author~=^(imgbot\[bot\]|app/imgbot)$
- base=develop
- check-success=All Checks Passed
- -draft
Expand Down
Loading