chore: declare allow_auto_merge in settings.yml for compliance#149
chore: declare allow_auto_merge in settings.yml for compliance#149don-petry wants to merge 28 commits into
Conversation
Adds `allow_auto_merge: true` to .github/settings.yml so probot/settings enforces the setting as policy-as-code. The live repo setting was also explicitly set via the GitHub API to ensure the compliance audit sees `true` rather than `null` in the next run. PR #122 made the same change but was never merged, which is why the compliance audit kept reporting this finding. Closes #105 Co-authored-by: don-petry <don-petry@users.noreply.github.com>
📝 WalkthroughWalkthroughA single configuration line is added to Changes
Estimated code review effort🎯 1 (Trivial) | ⏱️ ~2 minutes 🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
|
@don-petry This PR is ready for review and merge. It fixes the |
There was a problem hiding this comment.
Pull request overview
This PR codifies the repository’s auto-merge compliance setting by declaring allow_auto_merge: true in probot/settings, ensuring the compliance audit (issue #105) sees an explicit true rather than null via the GitHub API.
Changes:
- Add
allow_auto_merge: trueunder therepository:block in.github/settings.yml.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
There was a problem hiding this comment.
🧹 Nitpick comments (1)
.github/settings.yml (1)
8-10: Ensure branch protection rules are configured when enabling auto-merge.When enabling
allow_auto_merge, verify that branch protection rules on your main/target branches require:
- Minimum number of approving reviews
- Status checks to pass before merging
- Up-to-date branches (if applicable)
This ensures auto-merge (especially for Dependabot PRs) cannot bypass your review and quality gates.
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In @.github/settings.yml around lines 8 - 10, The repository config enables allow_auto_merge but lacks branch protection settings; update the GitHub settings to add branch protection rules for main/target branches (e.g., add required_pull_request_reviews with a minimum approval count, required_status_checks with the list of checks that must pass, and require_up_to_date_branch/strict status for up-to-date branches) so auto-merge cannot bypass review or CI gates—apply these rules alongside the existing repository keys (repository, has_discussions, allow_auto_merge).
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Nitpick comments:
In @.github/settings.yml:
- Around line 8-10: The repository config enables allow_auto_merge but lacks
branch protection settings; update the GitHub settings to add branch protection
rules for main/target branches (e.g., add required_pull_request_reviews with a
minimum approval count, required_status_checks with the list of checks that must
pass, and require_up_to_date_branch/strict status for up-to-date branches) so
auto-merge cannot bypass review or CI gates—apply these rules alongside the
existing repository keys (repository, has_discussions, allow_auto_merge).
ℹ️ Review info
⚙️ Run configuration
Configuration used: Path: .coderabbit.yaml
Review profile: CHILL
Plan: Pro
Run ID: 8f8902d6-1fb0-4c35-bf28-fec671935fa8
📒 Files selected for processing (1)
.github/settings.yml
|
|
Auto-rebase failed — merge conflict — this branch has conflicts with dev-lead will attempt to resolve this automatically. If it cannot, a follow-up comment will explain what needs manual attention. To resolve manually instead: |
|
Auto-rebase failed — merge conflict — this branch has conflicts with dev-lead will attempt to resolve this automatically. If it cannot, a follow-up comment will explain what needs manual attention. To resolve manually instead: |
|
Auto-rebase failed — merge conflict — this branch has conflicts with dev-lead will attempt to resolve this automatically. If it cannot, a follow-up comment will explain what needs manual attention. To resolve manually instead: |
|
Auto-rebase failed — merge conflict — this branch has conflicts with dev-lead will attempt to resolve this automatically. If it cannot, a follow-up comment will explain what needs manual attention. To resolve manually instead: |
|
Auto-rebase failed — merge conflict — this branch has conflicts with dev-lead will attempt to resolve this automatically. If it cannot, a follow-up comment will explain what needs manual attention. To resolve manually instead: |
|
@dev-lead - please fix this PR |
|
Auto-rebase failed — merge conflict — this branch has conflicts with dev-lead will attempt to resolve this automatically. If it cannot, a follow-up comment will explain what needs manual attention. To resolve manually instead: |
|
Auto-rebase failed — merge conflict — this branch has conflicts with dev-lead will attempt to resolve this automatically. If it cannot, a follow-up comment will explain what needs manual attention. To resolve manually instead: |
|
Auto-rebase failed — merge conflict — this branch has conflicts with dev-lead will attempt to resolve this automatically. If it cannot, a follow-up comment will explain what needs manual attention. To resolve manually instead: |
|
Auto-rebase failed — merge conflict — this branch has conflicts with dev-lead will attempt to resolve this automatically. If it cannot, a follow-up comment will explain what needs manual attention. To resolve manually instead: |
|
Auto-rebase failed — merge conflict — this branch has conflicts with dev-lead will attempt to resolve this automatically. If it cannot, a follow-up comment will explain what needs manual attention. To resolve manually instead: |
|
Auto-rebase failed — merge conflict — this branch has conflicts with dev-lead will attempt to resolve this automatically. If it cannot, a follow-up comment will explain what needs manual attention. To resolve manually instead: |
|
Auto-rebase failed — merge conflict — this branch has conflicts with dev-lead will attempt to resolve this automatically. If it cannot, a follow-up comment will explain what needs manual attention. To resolve manually instead: |
|
Auto-rebase failed — merge conflict — this branch has conflicts with dev-lead will attempt to resolve this automatically. If it cannot, a follow-up comment will explain what needs manual attention. To resolve manually instead: |
|
Auto-rebase failed — merge conflict — this branch has conflicts with dev-lead will attempt to resolve this automatically. If it cannot, a follow-up comment will explain what needs manual attention. To resolve manually instead: |
|
Auto-rebase failed — merge conflict — this branch has conflicts with dev-lead will attempt to resolve this automatically. If it cannot, a follow-up comment will explain what needs manual attention. To resolve manually instead: |
|
Auto-rebase failed — merge conflict — this branch has conflicts with dev-lead will attempt to resolve this automatically. If it cannot, a follow-up comment will explain what needs manual attention. To resolve manually instead: |
|
Auto-rebase failed — merge conflict — this branch has conflicts with dev-lead will attempt to resolve this automatically. If it cannot, a follow-up comment will explain what needs manual attention. To resolve manually instead: |
|
Auto-rebase failed — merge conflict — this branch has conflicts with dev-lead will attempt to resolve this automatically. If it cannot, a follow-up comment will explain what needs manual attention. To resolve manually instead: |
|
Auto-rebase failed — merge conflict — this branch has conflicts with dev-lead will attempt to resolve this automatically. If it cannot, a follow-up comment will explain what needs manual attention. To resolve manually instead: |
|
Closing due to merge conflict that cannot be auto-rebased. Re-implementing from fresh main via dev-lead. |
Pull request was closed



Summary
allow_auto_merge: trueto.github/settings.ymlso probot/settings enforces the setting as policy-as-codetruerather thannullRoot Cause
The weekly compliance audit checks
allow_auto_mergevia the GitHub API. The field returnsnullwhen it hasn't been explicitly set via the API (even if the UI shows it as enabled). PR #122 made the samesettings.ymlchange but was never merged, so the finding persisted.This fix:
PATCH /repos/petry-projects/broodlywithallow_auto_merge=trueto immediately remediate the live settingsettings.ymlso probot/settings keeps it enforced and prevents future driftChanges
.github/settings.yml— addedallow_auto_merge: trueunder therepository:blockCloses #105
Generated with Claude Code
Summary by CodeRabbit