Merge branch 'release' into main

Browse source

Reconciles the four commits that landed on release via the hotfix path and
were never down-merged: the onboarding guide (a23c667), its follow-up fixes
(18f50ad, #99), and two alerting fixes (9b0fae5 #94, 1f9a6f0 #96).

The resulting tree is byte-identical to main — every one of those changes
already reached main independently, so this carries no content. What it
carries is ancestry: release was not an ancestor of main, which made
main -> release unmergeable under any merge style and is why #132 reported
mergeable=false.

Conflicts were add/add on docs/onboarding/* and one comment line in
observability/grafana/provisioning/alerting/rules-prod.yml. All resolved to
main's side: release's copies predate the vps1/vps2 cutover and still
describe beta on vps1, dev on the desktop, and Forgejo co-located with beta.

BRANCHING.md requires this down-merge in the same session as the hotfix.
That step was missed; this closes it.

...

This commit is contained in:

Emi Griffith 2026-08-01 07:29:21 -07:00

parent 7e68c07b27 18f50ad09b

commit 90142cebbf

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available