Skip to content

Commit

Permalink
fix: do not allow auto-merge if resources are deleted
Browse files Browse the repository at this point in the history
  • Loading branch information
netomi committed Mar 20, 2024
1 parent bb0d31e commit c910b69
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion otterdog/webapp/tasks/validate_pull_request.py
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,11 @@ async def _update_final_status(self, validation_result: ValidationResult) -> Non
self._pull_request,
valid=validation_result.validation_success,
requires_manual_apply=validation_result.requires_secrets or validation_result.requires_web_ui,
supports_auto_merge=not (validation_result.requires_secrets or validation_result.requires_web_ui),
supports_auto_merge=not (
validation_result.requires_secrets
or validation_result.requires_web_ui
or validation_result.includes_deletions
),
)

if pull_request_model.can_be_automerged():
Expand Down

0 comments on commit c910b69

Please sign in to comment.