Skip to content

feat: implement issue #164 — Compliance: delete_branch_on_merge#362

Merged
don-petry merged 15 commits into
mainfrom
dev-lead/issue-164-20260602-1220
Jun 15, 2026
Merged

feat: implement issue #164 — Compliance: delete_branch_on_merge#362
don-petry merged 15 commits into
mainfrom
dev-lead/issue-164-20260602-1220

Conversation

@don-petry

@don-petry don-petry commented Jun 2, 2026

Copy link
Copy Markdown
Collaborator

Clean up duplicate .dev-lead/ entries in .gitignore (16 duplicates reduced to 1).

Note: delete_branch_on_merge: true was already present in .github/settings.yml prior to this PR (added in #218). Issue #164 compliance is implemented there; this PR only removes the erroneous duplicate .gitignore entries introduced during that attempt.

Summary by CodeRabbit

  • Chores
    • Cleaned up repository ignore rules by removing duplicated entries for a more consistent configuration.

Note: This release contains no user-facing changes.

Copilot AI review requested due to automatic review settings June 2, 2026 12:22
@don-petry don-petry requested a review from a team as a code owner June 2, 2026 12:22

Copilot AI left a comment

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.

Copilot wasn't able to review any files in this pull request.

@coderabbitai

coderabbitai Bot commented Jun 2, 2026

Copy link
Copy Markdown

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: b3a3f55e-3827-4424-9ac8-9887a092cec1

📥 Commits

Reviewing files that changed from the base of the PR and between 0f14641 and ff21f9b.

📒 Files selected for processing (1)
  • .gitignore
💤 Files with no reviewable changes (1)
  • .gitignore

📝 Walkthrough

Walkthrough

Duplicate .dev-lead/ ignore patterns are removed from .gitignore. The file previously contained multiple consecutive identical entries; this change consolidates them into a single rule, eliminating redundancy without affecting functionality.

Changes

gitignore de-duplication

Layer / File(s) Summary
De-duplicate .dev-lead/ entries
.gitignore
Removes consecutive duplicate .dev-lead/ ignore patterns, consolidating the rule into a single entry.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~1 minutes

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Title check ⚠️ Warning The PR title claims to implement issue #164 regarding delete_branch_on_merge compliance, but the actual changes only involve deduplicating .gitignore entries, which is unrelated to the stated objective. Either update the PR title to accurately reflect that it addresses .gitignore deduplication, or ensure the PR actually implements the compliance requirement for delete_branch_on_merge in GitHub settings.
✅ Passed checks (4 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.

✏️ 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 dev-lead/issue-164-20260602-1220

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.

@gemini-code-assist gemini-code-assist 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.

Code Review

This pull request adds a redundant ".dev-lead/" entry to the ".gitignore" file. The review comment correctly points out that this entry is already present multiple times and should not be added again.

Comment thread .gitignore Outdated

@chatgpt-codex-connector chatgpt-codex-connector 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.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 0112dff14d

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread .gitignore Outdated
@don-petry

Copy link
Copy Markdown
Collaborator Author

@dev-lead Please action the unresolved Codex review comments on this PR. (Manual re-trigger — #445 now trusts chatgpt-codex-connector[bot].)

@don-petry

Copy link
Copy Markdown
Collaborator Author

@dev-lead please process and advance this PR — fix any failing CI, resolve outstanding review threads, and enable auto-merge once it's green and approvable.

@donpetry-bot

donpetry-bot commented Jun 11, 2026

Copy link
Copy Markdown
Contributor
Superseded by automated re-review at 772b1087a823b8523f7493b2184fdb37e1a4a704 — click to expand prior review.

Review — fix requested (cycle 1/3)

The automated review identified the following issues. Please address each one:

Findings to fix

Automated review — NEEDS HUMAN REVIEW

Risk: MEDIUM
Reviewed commit: d96fa561de3c0af390b3170531ad62d64ffce14b
Cascade: triage → deep (triage: haiku 4.5 → deep: sonnet 4.6 + duck: o4-mini → audit: opus 4.7)

Summary

This PR adds a fourth duplicate .dev-lead/ entry to .gitignore, which has no effect on the delete_branch_on_merge repository setting required by issue #164. The actual compliance fix must update .github/settings.yml or scripts/apply-repo-settings.sh to set delete_branch_on_merge: true; that change is absent. The PR's Closes #164 caused the compliance issue to auto-close despite remaining unresolved.

Findings

  • MAJOR: The PR claims to implement delete_branch_on_merge compliance (issue Compliance: delete_branch_on_merge #164), but adds only a redundant .gitignore entry. The delete_branch_on_merge setting is a GitHub repository-level toggle, not a file-ignore rule. Neither .github/settings.yml nor scripts/apply-repo-settings.sh were modified, so the compliance requirement remains unmet.
  • MAJOR: Issue Compliance: delete_branch_on_merge #164 was auto-closed via Closes #164 in this PR body, but the underlying compliance finding — 'Automatically delete head branches must be enabled (current: null, expected: true)' — has not been addressed. The compliance audit would re-flag this repository on the next run.
  • MINOR: .dev-lead/ already appears three times in .gitignore (lines 22–24). This PR adds a fourth identical entry, confirmed redundant by both Gemini and Codex advisory bots. The .gitignore file should be cleaned up to contain exactly one such entry.
  • INFO: All CI checks pass (CodeQL, SonarCloud, CodeRabbit) — the change is syntactically valid and introduces no new security issues, but CI correctness does not validate whether the PR fulfills its stated compliance objective.

Reviewed by the PR-review cascade (triage: haiku 4.5 → deep: sonnet 4.6 + duck: o4-mini → audit: opus 4.7). Reply if you need a human review.

Additional tasks

  1. Resolve all unresolved review thread comments from other reviewers
  2. Ensure all CI checks pass after your changes
  3. Rebase on the target branch if behind
  4. Do NOT modify files unrelated to the findings above

The review cascade will automatically re-review after new commits are pushed.

@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.

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In @.gitignore:
- Line 25: The PR claims to fix issue `#164` (GitHub compliance requirement to
enable branch deletion on merge) but only modifies `.gitignore` with a duplicate
entry, leaving the actual compliance requirement unimplemented. First, remove
the duplicate `.dev-lead/` entries from `.gitignore` (keep only one entry if it
is truly needed, or remove all if they are erroneous). Second, implement the
actual compliance requirement by modifying `.github/settings.yml` to set the
`delete_branch_on_merge` configuration to `true`. Finally, remove "Closes `#164`"
from the PR description to prevent premature closure of the issue until the
actual compliance fix is verified and merged.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: 75e92070-9f51-4a19-850c-f0d679816334

📥 Commits

Reviewing files that changed from the base of the PR and between 9d3f113 and 0f14641.

📒 Files selected for processing (1)
  • .gitignore

Comment thread .gitignore Outdated
@don-petry

Copy link
Copy Markdown
Collaborator Author

Dev-Lead — fix-reviews (applied)

Changes committed and pushed.

@don-petry don-petry enabled auto-merge (squash) June 14, 2026 21:23
@don-petry don-petry disabled auto-merge June 14, 2026 21:24
@don-petry

Copy link
Copy Markdown
Collaborator Author

Dev-Lead — waiting on PR blockers (intent: review-changes)

PR: #362
No changes were committed, but the PR still has blocking checks or reviews (failing or cancelled checks, or changes-requested reviews). The retry cron will re-attempt automatically. Next attempt after: 2026-06-14T21:54:47Z

@don-petry

Copy link
Copy Markdown
Collaborator Author

Note

@don-petry I reviewed this PR and no code changes were needed, but it still has blocking checks or reviews (failing or cancelled checks, or changes-requested reviews), so I cannot mark it done yet. I'll re-check automatically.
Next attempt after: 2026-06-14T21:54:47Z

@don-petry don-petry enabled auto-merge (squash) June 14, 2026 21:24

@donpetry-bot donpetry-bot left a comment

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.

Automated review — APPROVED ✓

Risk: LOW
Reviewed commit: 772b1087a823b8523f7493b2184fdb37e1a4a704
Review mode: triage-approved (single reviewer)

Summary

This PR is now a pure cleanup: it removes 14 duplicate .dev-lead/ entries from .gitignore, leaving exactly one. The earlier cascade flagged that issue #164 (delete_branch_on_merge compliance) was unmet and that the duplicate entries were redundant. Both are now resolved: compliance was verified present (delete_branch_on_merge: true in .github/settings.yml and at the live repo level, implemented in #218), the Closes #164 reference was removed so the issue no longer auto-closes, and the redundant entries are cleaned up to a single entry.

Linked issue analysis

No issue is closed by this PR (closingIssuesReferences is empty). The PR body correctly clarifies that #164 compliance lives in .github/settings.yml (added in #218). I independently confirmed delete_branch_on_merge: true is set both in that file and on the repository itself via the GitHub API. This PR's scope is limited to removing erroneous duplicate .gitignore entries introduced during the original #164 attempt.

Findings

  • LOW: .gitignore reduced from multiple duplicate .dev-lead/ entries to a single one (additions: 0, deletions: 14). No functional change beyond de-duplication.
  • RESOLVED (prior MAJOR): delete_branch_on_merge compliance — verified present in settings.yml and at repo level. Not in scope for this PR by design.
  • RESOLVED (prior MAJOR): Closes #164 removed from body; issue will no longer auto-close prematurely.
  • RESOLVED (prior MINOR): duplicate entries cleaned up.
  • All three reviewer threads (Gemini, Codex, CodeRabbit) are resolved and outdated.

CI status

All checks green: CodeQL (actions, javascript-typescript, python + rollup) SUCCESS, CodeRabbit SUCCESS. mergeStateStatus is BLOCKED only because this required review is pending.


Reviewed automatically by the PR-review agent (single-reviewer mode: fable 5). Reply if you need a human review.

@chatgpt-codex-connector

Copy link
Copy Markdown

You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard.
To continue using code reviews, you can upgrade your account or add credits to your account and enable them for code reviews in your settings.

@don-petry don-petry disabled auto-merge June 15, 2026 04:13
@sonarqubecloud

Copy link
Copy Markdown

@don-petry

Copy link
Copy Markdown
Collaborator Author

Dev-Lead — review-changes (no-changes)

No changes were needed for this PR.

@don-petry don-petry merged commit 759a1d8 into main Jun 15, 2026
29 checks passed
@don-petry don-petry deleted the dev-lead/issue-164-20260602-1220 branch June 15, 2026 04:15
@github-actions

Copy link
Copy Markdown
Contributor

CI Failure: SonarCloud Code Analysis

Step: Quality Gate
Root cause: Lint/style

SonarCloud's Quality Gate failed due to 23 Security Hotspots detected in the new code (leak period). These are potential security vulnerabilities flagged by static analysis that must be reviewed or acknowledged before the gate passes. The PR itself only removes duplicate .gitignore entries and does not introduce code changes, but SonarCloud still evaluates the full branch against its quality gate conditions.

Suggested fix: Open the SonarCloud dashboard and triage the 23 Security Hotspots — either mark them as "Safe" (acknowledged, not exploitable) or fix the underlying code to clear the Quality Gate.

View run logs

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.

4 participants