chore: sync main → staging (manual bridge for #2211)

Browse Source

Brings the merge commit a3864eaf (PR #2211 staging→main UI merge) back
onto staging so the staging-as-superset-of-main invariant holds again.

Why this is needed instead of auto-sync firing:

  - Push-to-main ran the OLD direct-push auto-sync workflow that was
    on main at the time (a3864eaf), not the new PR-based version.
  - Direct push to staging is blocked by the merge_queue ruleset
    (GH013), so the run failed.
  - The new PR-based auto-sync (#2234) lives on staging but isn't on
    main yet — it can't fire on the push that would've triggered it.
  - This PR breaks the deadlock manually. Once it merges, auto-promote
    fast-forwards main and main picks up the new auto-sync workflow,
    making the system self-healing for any future #2211-style merge.

Diff is empty — a3864eaf is itself a staging→main merge, so its tree
matches staging's tree at that point. This commit only adds the merge
graph, not new file content.

...

This commit is contained in:

github-actions[bot] 2026-04-28 16:30:48 -07:00

parent 44a1bb0649 a3864eaf3d

commit 372fdbb9cc

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 Not Available