Skip to content

chore: declare allow_auto_merge in settings.yml for compliance#149

Closed
don-petry wants to merge 28 commits into
mainfrom
claude/issue-105-20260420-0333
Closed

chore: declare allow_auto_merge in settings.yml for compliance#149
don-petry wants to merge 28 commits into
mainfrom
claude/issue-105-20260420-0333

Conversation

@don-petry

@don-petry don-petry commented Apr 20, 2026

Copy link
Copy Markdown
Contributor

Summary

  • Adds allow_auto_merge: true to .github/settings.yml so probot/settings enforces the setting as policy-as-code
  • The live repository setting was also explicitly set via the GitHub API to ensure the next compliance audit sees true rather than null

Root Cause

The weekly compliance audit checks allow_auto_merge via the GitHub API. The field returns null when it hasn't been explicitly set via the API (even if the UI shows it as enabled). PR #122 made the same settings.yml change but was never merged, so the finding persisted.

This fix:

  1. Directly called PATCH /repos/petry-projects/broodly with allow_auto_merge=true to immediately remediate the live setting
  2. Codifies the setting in settings.yml so probot/settings keeps it enforced and prevents future drift

Changes

  • .github/settings.yml — added allow_auto_merge: true under the repository: block

Closes #105

Generated with Claude Code

Summary by CodeRabbit

  • Chores
    • Updated repository settings to enable automated merge functionality.

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>
Copilot AI review requested due to automatic review settings April 20, 2026 03:38
@coderabbitai

coderabbitai Bot commented Apr 20, 2026

Copy link
Copy Markdown
📝 Walkthrough

Walkthrough

A single configuration line is added to .github/settings.yml to enable GitHub's auto-merge functionality, setting repository.allow_auto_merge: true to comply with repository settings standards.

Changes

Cohort / File(s) Summary
GitHub Settings Configuration
.github/settings.yml
Enable auto-merge feature by adding repository.allow_auto_merge: true property.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~2 minutes

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title accurately describes the main change: enabling allow_auto_merge in settings.yml for compliance purposes.
Linked Issues check ✅ Passed The PR directly addresses issue #105 by enabling allow_auto_merge in settings.yml and configuring it via the GitHub API, meeting all stated requirements.
Out of Scope Changes check ✅ Passed The single change to .github/settings.yml is directly scoped to the compliance requirement stated in issue #105.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch claude/issue-105-20260420-0333

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.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@don-petry

Copy link
Copy Markdown
Contributor Author

@don-petry This PR is ready for review and merge. It fixes the allow_auto_merge compliance finding by declaring allow_auto_merge: true in .github/settings.yml so probot/settings enforces it as policy-as-code. The live setting was also explicitly set via the GitHub API to immediately remediate the finding before the next weekly audit.

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

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: true under the repository: block in .github/settings.yml.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

🧹 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

📥 Commits

Reviewing files that changed from the base of the PR and between 9a6419e and 419abf6.

📒 Files selected for processing (1)
  • .github/settings.yml

@don-petry don-petry enabled auto-merge (squash) April 25, 2026 18:15
@github-actions github-actions Bot requested a review from a team as a code owner May 4, 2026 20:35
@sonarqubecloud

Copy link
Copy Markdown

@don-petry

Copy link
Copy Markdown
Contributor Author

Auto-rebase failed — merge conflict — this branch has conflicts with main that must be resolved.

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:

git fetch origin
git merge origin/main
# resolve conflicts, then:
git add .
git commit
git push

@don-petry

Copy link
Copy Markdown
Contributor Author

Auto-rebase failed — merge conflict — this branch has conflicts with main that must be resolved.

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:

git fetch origin
git merge origin/main
# resolve conflicts, then:
git add .
git commit
git push

@don-petry

Copy link
Copy Markdown
Contributor Author

Auto-rebase failed — merge conflict — this branch has conflicts with main that must be resolved.

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:

git fetch origin
git merge origin/main
# resolve conflicts, then:
git add .
git commit
git push

@don-petry

Copy link
Copy Markdown
Contributor Author

Auto-rebase failed — merge conflict — this branch has conflicts with main that must be resolved.

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:

git fetch origin
git merge origin/main
# resolve conflicts, then:
git add .
git commit
git push

@don-petry

Copy link
Copy Markdown
Contributor Author

Auto-rebase failed — merge conflict — this branch has conflicts with main that must be resolved.

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:

git fetch origin
git merge origin/main
# resolve conflicts, then:
git add .
git commit
git push

@don-petry

Copy link
Copy Markdown
Contributor Author

@dev-lead - please fix this PR

@don-petry

Copy link
Copy Markdown
Contributor Author

Auto-rebase failed — merge conflict — this branch has conflicts with main that must be resolved.

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:

git fetch origin
git merge origin/main
# resolve conflicts, then:
git add .
git commit
git push

@don-petry

Copy link
Copy Markdown
Contributor Author

Auto-rebase failed — merge conflict — this branch has conflicts with main that must be resolved.

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:

git fetch origin
git merge origin/main
# resolve conflicts, then:
git add .
git commit
git push

@don-petry

Copy link
Copy Markdown
Contributor Author

Auto-rebase failed — merge conflict — this branch has conflicts with main that must be resolved.

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:

git fetch origin
git merge origin/main
# resolve conflicts, then:
git add .
git commit
git push

@don-petry

Copy link
Copy Markdown
Contributor Author

Auto-rebase failed — merge conflict — this branch has conflicts with main that must be resolved.

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:

git fetch origin
git merge origin/main
# resolve conflicts, then:
git add .
git commit
git push

@don-petry

Copy link
Copy Markdown
Contributor Author

Auto-rebase failed — merge conflict — this branch has conflicts with main that must be resolved.

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:

git fetch origin
git merge origin/main
# resolve conflicts, then:
git add .
git commit
git push

@don-petry

Copy link
Copy Markdown
Contributor Author

Auto-rebase failed — merge conflict — this branch has conflicts with main that must be resolved.

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:

git fetch origin
git merge origin/main
# resolve conflicts, then:
git add .
git commit
git push

@don-petry

Copy link
Copy Markdown
Contributor Author

Auto-rebase failed — merge conflict — this branch has conflicts with main that must be resolved.

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:

git fetch origin
git merge origin/main
# resolve conflicts, then:
git add .
git commit
git push

@don-petry

Copy link
Copy Markdown
Contributor Author

Auto-rebase failed — merge conflict — this branch has conflicts with main that must be resolved.

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:

git fetch origin
git merge origin/main
# resolve conflicts, then:
git add .
git commit
git push

@don-petry

Copy link
Copy Markdown
Contributor Author

Auto-rebase failed — merge conflict — this branch has conflicts with main that must be resolved.

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:

git fetch origin
git merge origin/main
# resolve conflicts, then:
git add .
git commit
git push

@don-petry

Copy link
Copy Markdown
Contributor Author

Auto-rebase failed — merge conflict — this branch has conflicts with main that must be resolved.

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:

git fetch origin
git merge origin/main
# resolve conflicts, then:
git add .
git commit
git push

@don-petry

Copy link
Copy Markdown
Contributor Author

Auto-rebase failed — merge conflict — this branch has conflicts with main that must be resolved.

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:

git fetch origin
git merge origin/main
# resolve conflicts, then:
git add .
git commit
git push

@don-petry

Copy link
Copy Markdown
Contributor Author

Auto-rebase failed — merge conflict — this branch has conflicts with main that must be resolved.

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:

git fetch origin
git merge origin/main
# resolve conflicts, then:
git add .
git commit
git push

@don-petry

Copy link
Copy Markdown
Contributor Author

Auto-rebase failed — merge conflict — this branch has conflicts with main that must be resolved.

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:

git fetch origin
git merge origin/main
# resolve conflicts, then:
git add .
git commit
git push

@don-petry

Copy link
Copy Markdown
Contributor Author

Auto-rebase failed — merge conflict — this branch has conflicts with main that must be resolved.

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:

git fetch origin
git merge origin/main
# resolve conflicts, then:
git add .
git commit
git push

@don-petry

Copy link
Copy Markdown
Contributor Author

Closing due to merge conflict that cannot be auto-rebased. Re-implementing from fresh main via dev-lead.

@don-petry don-petry closed this Jun 2, 2026
auto-merge was automatically disabled June 2, 2026 12:24

Pull request was closed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Compliance: allow_auto_merge

2 participants