Skip to content

chore: merge master into 6.x - #612

Merged
cjbarth merged 4 commits into
6.xfrom
chore/merge-master-into-6.x-6.3.1
Sep 21, 2026
Merged

cjbarth merged 4 commits into
6.xfrom
chore/merge-master-into-6.x-6.3.1

Conversation

@cjbarth

@cjbarth cjbarth commented Sep 21, 2026

Copy link
Copy Markdown
Contributor

Brings the 6.x release branch up to date with master ahead of 6.3.1.

What comes in

#610 is the only source change. It affects signing only: when publicCert holds no PEM certificate, getKeyInfoContent now also publishes the value if it is the bare base64 of exactly one certificate. Verification is unchanged. Nothing that signs today now throws, so this is a patch release.

Result

The merge had no conflicts. The merged tree is identical to master except for the release files 6.x keeps for itself: CHANGELOG.md, .grenrc.js, and package.json / package-lock.json.

The version stays at 6.3.0. The bump goes in its own Release 6.3.1 commit after this merge.

npm run build, npm test (450 passing), and npm run lint all pass on the merged tree.

🤖 Generated with Claude Code

@coderabbitai

coderabbitai Bot commented Sep 21, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Advanced

Run ID: 756bd6f9-7f95-494a-98d4-30e3aaaf6859

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

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.

@cjbarth
cjbarth merged commit be83674 into 6.x Sep 21, 2026
2 checks passed
@cjbarth
cjbarth deleted the chore/merge-master-into-6.x-6.3.1 branch September 21, 2026 13:56
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.

1 participant