Fix auto-merge to allow blocked state and optimize GitAuto check #2013
+129
−13
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1. Allow auto-merge when mergeable_state is "blocked" - Previously only allowed "clean" state - "blocked" can mean missing reviews, which auto-merge should bypass - Still block on: behind, dirty, unstable, unknown 2. Move GitAuto author check earlier (line 34) - Check immediately after extracting PR author - Avoids unnecessary database queries for non-GitAuto PRs - Usage table only tracks GitAuto activity 3. Add test for blocked state auto-merge - Verifies auto-merge works when reviews are missing - Total: 12 tests passing
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Allow auto-merge when mergeable_state is "blocked"
Move GitAuto author check earlier (line 34)
Add test for blocked state auto-merge