merge: resolve v1.22.2 conflicts with custom
Per Q4 resolution (documented on kanban t_83741c53): - .github/workflows/*: KEEP custom deletion (fork uses Gitea Actions under .gitea/workflows) - ChatInput.tsx: KEEP custom forge picker states + provider-aware linkedPr - WorkStatusContextSection.tsx: combine imports (WorkStatusPill + useConfigStore) - WorkStatusPrimaryGroup.tsx: upstream nested-git/bootstrap-gate base + custom GitLab/Gitea forge rows - NewWorktreeDialog.tsx: combine dialogs; keep custom MR/PR branch resolution - SettingsView.tsx: custom deps minus undefined openThirdPartyProviderSetup - search.ts + search.test.ts: KEEP upstream (enter-to-send, large-text-paste, first-party integrations) - tr.ts: drop 4 auto-merge duplicate gitView.empty.* keys
This commit is contained in:
@@ -1,3 +1,7 @@
|
||||
> **Note: This is a custom fork of [OpenChamber](https://github.com/openchamber/openchamber).**
|
||||
>
|
||||
> This version adds native Gitea and GitLab forge integration by rewriting the clients to use `tea` and `glab` CLI tools as transports. This provides a 1:1 endpoint mapping via a raw REST proxy. Custom releases for this fork are tagged as `custom-vX.Y.Z`.
|
||||
|
||||
# <picture><source media="(prefers-color-scheme: dark)" srcset="docs/references/badges/openchamber-logo-dark.svg"><img src="docs/references/badges/openchamber-logo-light.svg" width="32" height="32" align="absmiddle" /></picture> OpenChamber
|
||||
|
||||
[](https://github.com/openchamber/openchamber/stargazers)
|
||||
|
||||
Reference in New Issue
Block a user