docs: correct the merge-method section against the live ruleset - #5
Merged
Conversation
The Merge method section was wrong in both directions, and this is the document other repos in the org are meant to copy their settings from. It said "the org ruleset allows squash merges only". GET /orgs/mukoko-dev/rulesets/22932468 returns `allowed_merge_methods: ["rebase"]` on the pull_request rule. Rebase, not squash. It said "the repository-level settings in this org still leave merge-commit and rebase switched on". Every repository checked - mukoko, mukoko-auth, kweli, kweli-mcp, mukoko-lingo, mukoko-home, packages-ui - reports allow_squash_merge: false, allow_merge_commit: false, allow_rebase_merge: true, allow_auto_merge: true. The settings and the ruleset agree; the README was the only thing disagreeing with either. It listed `required_signatures` as part of the ruleset. The ruleset's rules are deletion, non_fast_forward, required_linear_history, pull_request and required_status_checks. There is no signature requirement, and the README now says so explicitly so the claim does not come back. Added, all verified against the API: - The rest of what the pull_request rule actually does - stale reviews dismissed on push, review threads must resolve, unattributed changes need an extra approval, and required_approving_review_count is 0. - That required_status_checks is strict, so branches must be up to date. - That the ruleset skips sandbox-* and archive-* repositories. - The second ruleset, enterprise-main-protection, inherited from the bundu-labs enterprise and currently in evaluate mode, blocking nothing. Also: - Documented the three workflows this repository actually ships - lint.yml, pr-title-lint.yml and stale.yml - with their triggers. The README described only lint.yml. - Extended the reusable-workflow table. nyuchi/.github publishes 21 reusable workflows; the table listed five of them and read as exhaustive. It now covers Python, Rust, MDX docs, Docker, Terraform/OpenTofu and Solidity, and says plainly that the directory is the authority. - Added the Lint badge (curls 200) and an at-a-glance line, and a licence section recording that no LICENSE file is committed here. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
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
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.
The Merge method section was wrong in both directions, and this is the
document other repos in the org are meant to copy their settings from.
It said "the org ruleset allows squash merges only". GET
/orgs/mukoko-dev/rulesets/22932468 returns
allowed_merge_methods: ["rebase"]on the pull_request rule. Rebase, notsquash.
It said "the repository-level settings in this org still leave merge-commit
and rebase switched on". Every repository checked - mukoko, mukoko-auth,
kweli, kweli-mcp, mukoko-lingo, mukoko-home, packages-ui - reports
allow_squash_merge: false, allow_merge_commit: false, allow_rebase_merge:
true, allow_auto_merge: true. The settings and the ruleset agree; the README
was the only thing disagreeing with either.
It listed
required_signaturesas part of the ruleset. The ruleset's rulesare deletion, non_fast_forward, required_linear_history, pull_request and
required_status_checks. There is no signature requirement, and the README now
says so explicitly so the claim does not come back.
Added, all verified against the API:
dismissed on push, review threads must resolve, unattributed changes need
an extra approval, and required_approving_review_count is 0.
bundu-labs enterprise and currently in evaluate mode, blocking nothing.
Also:
pr-title-lint.yml and stale.yml - with their triggers. The README described
only lint.yml.
workflows; the table listed five of them and read as exhaustive. It now
covers Python, Rust, MDX docs, Docker, Terraform/OpenTofu and Solidity, and
says plainly that the directory is the authority.
section recording that no LICENSE file is committed here.
Co-Authored-By: Claude Opus 5 (1M context) noreply@anthropic.com