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
12 changes: 6 additions & 6 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ pull_request_rules:
- author~=^(dependabot\[bot\]|app/dependabot)$
- base=develop
- label=area:dependencies
- check-success=CI / check
- check-success=CI / lint
- check-success=changelog-validate / validate
- check-success=check
- check-success=lint
- check-success=validate
- -draft
- -conflict
actions:
Expand All @@ -19,9 +19,9 @@ pull_request_rules:
- base=develop
- label=area:dependencies
- label=meta:dependabot-security
- check-success=CI / check
- check-success=CI / lint
- check-success=changelog-validate / validate
- check-success=check
- check-success=lint
- check-success=validate
Comment on lines +22 to +24

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The rule 'Auto-merge Dependabot security updates on develop' (lines 16-29) is entirely redundant. Any pull request that satisfies its conditions (including having both 'area:dependencies' and 'meta:dependabot-security' labels) will already satisfy the conditions of the first rule 'Auto-merge Dependabot dependency updates on develop' (lines 2-14) and be merged using the same squash method. Consider removing the redundant second rule to simplify the configuration.

- -draft
- -conflict
actions:
Expand Down
Loading