merge: resolve v1.21.1 conflicts with custom

Browse Source

Resolve all 10 upstream v1.21.1 merge conflicts into custom, keeping
custom's GitLab/Gitea forge customizations layered on upstream while
lifting upstream improvements. Restored tr.ts i18n key parity with the
custom en.ts dictionary (471 custom forge keys added, en fallback) so the
upstream-introduced locale stays in parity.

Also stage bun.lock version alignment (1.21.0 -> 1.21.1) that matches the
staged package.json bump.

Verification: ui + web type-check pass; ui/web tests pass except
pre-existing failures on the custom baseline (forge.test.ts, session-actions,
issue-1637-2270, routes.test.js fs-stat directory scope).

...

This commit is contained in:

bot-hermes

2026-08-30 06:56:43 -04:00

parent 9963e6e3b7 6b2b12382e

commit e70af9ae1f

200 changed files with 44728 additions and 370 deletions

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

Download Patch File Download Diff File Expand all files Collapse all files

.github/pr-evidence/dark-git-page.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 145 KiB

.github/pr-evidence/dark-projects-page.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 146 KiB

.github/pr-evidence/evidence-link-dialog.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 182 KiB

.github/pr-evidence/evidence-link-filled.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 182 KiB

.github/pr-evidence/evidence-session-open.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 168 KiB

.github/pr-evidence/evidence-work-status.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 182 KiB

.github/pr-evidence/forge-gitea-connected.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 152 KiB

.github/pr-evidence/light-git-page.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 156 KiB

.github/pr-evidence/light-projects-page.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 156 KiB

.github/pr-evidence/narrow-dark-projects-page.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 56 KiB