# Commit history · gitcafe/zed

[View on GitCafe](https://git.cafe/gitcafe/zed/commits/28b29d09856f583db85502717f1d13c4f5a2e829)

Repository: [gitcafe/zed](https://git.cafe/gitcafe/zed)

Visibility: public

Requested revision: 28b29d09856f583db85502717f1d13c4f5a2e829

Requested commit: 28b29d09856f583db85502717f1d13c4f5a2e829

- [Give each \`Tab\` its own ID](https://git.cafe/gitcafe/zed/commit/28b29d09856f583db85502717f1d13c4f5a2e829?format=markdown) — 28b29d09856f583db85502717f1d13c4f5a2e829; Marshall Bowers

- [Wire up active style for \`Tab\`](https://git.cafe/gitcafe/zed/commit/52f2521f6a72b6b3e7f382099768d895378fc89f?format=markdown) — 52f2521f6a72b6b3e7f382099768d895378fc89f; Marshall Bowers

- [Remove \`Clone\` bound from \`IconElement\`](https://git.cafe/gitcafe/zed/commit/e1e8b63eb5355b1ca7be2b4c878c08eb62a0083b?format=markdown) — e1e8b63eb5355b1ca7be2b4c878c08eb62a0083b; Marshall Bowers

- [Remove \`Clone\` bound from \`Button\` and \`Details\`](https://git.cafe/gitcafe/zed/commit/a1aba3220971f5f10ee8cd46f458d7097b6bb45c?format=markdown) — a1aba3220971f5f10ee8cd46f458d7097b6bb45c; Marshall Bowers

- [Remove \`Clone\` bound for \`HighlightedLabel\`](https://git.cafe/gitcafe/zed/commit/fa3916d1bf8b3603fde75779d07cdd33977f5a16?format=markdown) — fa3916d1bf8b3603fde75779d07cdd33977f5a16; Marshall Bowers

- [Remove \`Clone\` bound for \`Input\`](https://git.cafe/gitcafe/zed/commit/3ac7ef90efed06929e1b87592f8d6d18d0ed7f32?format=markdown) — 3ac7ef90efed06929e1b87592f8d6d18d0ed7f32; Marshall Bowers

- [Remove \`Clone\` bound for \`Label\`](https://git.cafe/gitcafe/zed/commit/4050bf43c466fd093c15fc82cd7e8e56d57c0662?format=markdown) — 4050bf43c466fd093c15fc82cd7e8e56d57c0662; Marshall Bowers

- [Remove unused \`Interactive\` impl for \`FakeSettings\`](https://git.cafe/gitcafe/zed/commit/d91b423a45949c4d1bb863ccd4e4fe511c1707d1?format=markdown) — d91b423a45949c4d1bb863ccd4e4fe511c1707d1; Marshall Bowers

- [Merge branch 'gpui2' of github.com:zed-industries/zed into gpui2](https://git.cafe/gitcafe/zed/commit/2bbce2f0fd45987626fd71b6118ce84474c04a5c?format=markdown) — 2bbce2f0fd45987626fd71b6118ce84474c04a5c; Marshall Bowers

- [Wire up active style for \`Breadcrumb\`](https://git.cafe/gitcafe/zed/commit/1be1bffb290457efab27e9c3dd98b0119b482739?format=markdown) — 1be1bffb290457efab27e9c3dd98b0119b482739; Marshall Bowers

- [Identify \`IconButton\`](https://git.cafe/gitcafe/zed/commit/92542e6b94b531a3b833792da34762273537a10d?format=markdown) — 92542e6b94b531a3b833792da34762273537a10d; Marshall Bowers

- [Merge branch 'gpui2' into gpui2-theme-to-color](https://git.cafe/gitcafe/zed/commit/3932c1064e339b457b9a148cef91becb6b12a206?format=markdown) — 3932c1064e339b457b9a148cef91becb6b12a206; Marshall Bowers

- [Add missing \`Clone\` bounds](https://git.cafe/gitcafe/zed/commit/2189983323ba31aa0bbb57a95823fff0f583b630?format=markdown) — 2189983323ba31aa0bbb57a95823fff0f583b630; Marshall Bowers

- [Checkpoint \- Still Broken](https://git.cafe/gitcafe/zed/commit/58650b7d2d2cc19b8b4b5c08b69c59f263dd4043?format=markdown) — 58650b7d2d2cc19b8b4b5c08b69c59f263dd4043; Nate Butler

- [Checkpoint – Broken](https://git.cafe/gitcafe/zed/commit/bca97f7186d55139dbfe4ecf1a50efb6e8016b5c?format=markdown) — bca97f7186d55139dbfe4ecf1a50efb6e8016b5c; Nate Butler

- [Use \`line_height\` in \`z_index\` stories](https://git.cafe/gitcafe/zed/commit/b16d37953dd2e89853ca2b15a700170fc69cb26b?format=markdown) — b16d37953dd2e89853ca2b15a700170fc69cb26b; Marshall Bowers

- [Checkpoint](https://git.cafe/gitcafe/zed/commit/98c0e00a2c49c492f40983ef1cc5fa91ede2181d?format=markdown) — 98c0e00a2c49c492f40983ef1cc5fa91ede2181d; Antonio Scandurra

- [Checkpoint](https://git.cafe/gitcafe/zed/commit/3d8e9a593eb692d798d22de8b83a648c7622cb1f?format=markdown) — 3d8e9a593eb692d798d22de8b83a648c7622cb1f; Antonio Scandurra

- [Checkpoint](https://git.cafe/gitcafe/zed/commit/ffa3362e166fed44d49cc3418c997ccc7fd0994b?format=markdown) — ffa3362e166fed44d49cc3418c997ccc7fd0994b; Antonio Scandurra

- [Remove debugs](https://git.cafe/gitcafe/zed/commit/c22778bd92d6943929a80004cfa5d840572300e7?format=markdown) — c22778bd92d6943929a80004cfa5d840572300e7; Nate Butler

- [Use ui_size to build icon button](https://git.cafe/gitcafe/zed/commit/65828c14fc8574f853fe71fbc078956a36aceb0f?format=markdown) — 65828c14fc8574f853fe71fbc078956a36aceb0f; Nate Butler

- [Update line heights, buttons to respond to UI scale](https://git.cafe/gitcafe/zed/commit/7cb00aeb34902cca030bdc471a1aeef0941b6113?format=markdown) — 7cb00aeb34902cca030bdc471a1aeef0941b6113; Nate Butler

- [Use \`ui_size\` to set relative font sizes](https://git.cafe/gitcafe/zed/commit/7b2782c0f6cb967828df074908cabd1430ccbf55?format=markdown) — 7b2782c0f6cb967828df074908cabd1430ccbf55; Nate Butler

- [Remove unused code from storybook 2](https://git.cafe/gitcafe/zed/commit/3f076eeda66095153384ffcdcaecbeb677a887d5?format=markdown) — 3f076eeda66095153384ffcdcaecbeb677a887d5; Nate Butler

- [Update storybook2 to run the workspace by default](https://git.cafe/gitcafe/zed/commit/a35d350cbd85fadc25a91d9db392b17b4cbc8f39?format=markdown) — a35d350cbd85fadc25a91d9db392b17b4cbc8f39; Nate Butler

- [Merge branch 'n/gpui2ui-settings' into gpui2](https://git.cafe/gitcafe/zed/commit/a6a50113dab7155dfcf5f334c47ad219a48d90ba?format=markdown) — a6a50113dab7155dfcf5f334c47ad219a48d90ba; Nate Butler

- [Use \`SharedString\` for \`Input\`s](https://git.cafe/gitcafe/zed/commit/549e78d7b3ade6e540f15c56934c5df9ff83e66b?format=markdown) — 549e78d7b3ade6e540f15c56934c5df9ff83e66b; Marshall Bowers

- [Merge branch 'gpui2' of github.com:zed-industries/zed into gpui2](https://git.cafe/gitcafe/zed/commit/5a42ca6772a3275ed4449e563cd6737fcbb81177?format=markdown) — 5a42ca6772a3275ed4449e563cd6737fcbb81177; Marshall Bowers

- [Use \`SharedString\` for \`List\`s](https://git.cafe/gitcafe/zed/commit/8dad3ad8eafb086f306253d5ded065a75cf9c3df?format=markdown) — 8dad3ad8eafb086f306253d5ded065a75cf9c3df; Marshall Bowers

- [Use \`SharedString\` for \`Palette\` and \`PaletteItem\`s](https://git.cafe/gitcafe/zed/commit/856d23626f6d07518d7ff6f1191fdd7363ad551c?format=markdown) — 856d23626f6d07518d7ff6f1191fdd7363ad551c; Marshall Bowers

- [Checkpoint](https://git.cafe/gitcafe/zed/commit/8890636a56f0b3ec55ba03966478d2a3be7442bf?format=markdown) — 8890636a56f0b3ec55ba03966478d2a3be7442bf; Antonio Scandurra

- [Checkpoint](https://git.cafe/gitcafe/zed/commit/a0634fa79ea2289e3fb1c187e3cc44c0c25b60a6?format=markdown) — a0634fa79ea2289e3fb1c187e3cc44c0c25b60a6; Antonio Scandurra

- [WIP](https://git.cafe/gitcafe/zed/commit/03937a9f899d189f0f7550ea3a34b1af769a2ef3?format=markdown) — 03937a9f899d189f0f7550ea3a34b1af769a2ef3; Antonio Scandurra

- [Split \`Label\` and \`HighlightedLabel\`](https://git.cafe/gitcafe/zed/commit/24086191af914dc755f7e6844a06915c99e19c36?format=markdown) — 24086191af914dc755f7e6844a06915c99e19c36; Marshall Bowers

- [Use \`SharedString\` for \`Keybinding\`s](https://git.cafe/gitcafe/zed/commit/f0b9e9a89da94a37953fd66bab3982b642a3e94a?format=markdown) — f0b9e9a89da94a37953fd66bab3982b642a3e94a; Marshall Bowers

- [Use \`SharedString\` for \`Button\`s](https://git.cafe/gitcafe/zed/commit/6e3393c93fd2fe49fe616e0fa20260c3324b11dd?format=markdown) — 6e3393c93fd2fe49fe616e0fa20260c3324b11dd; Marshall Bowers

- [Merge branch 'gpui2' of github.com:zed-industries/zed into gpui2](https://git.cafe/gitcafe/zed/commit/aa41f97e383db405ca772e741e2df6ef7d787362?format=markdown) — aa41f97e383db405ca772e741e2df6ef7d787362; Marshall Bowers

- [Use \`SharedString\` for \`Label\`s](https://git.cafe/gitcafe/zed/commit/2b53c6778986e0bb7dad1f98d7568ab61276cb8b?format=markdown) — 2b53c6778986e0bb7dad1f98d7568ab61276cb8b; Marshall Bowers

- [Wire up hover styles on \`Button\`s](https://git.cafe/gitcafe/zed/commit/8321b9430e640158c110e60cb069c94b8aac34cc?format=markdown) — 8321b9430e640158c110e60cb069c94b8aac34cc; Marshall Bowers

- [Fix typo in doc comment](https://git.cafe/gitcafe/zed/commit/7f69350e4db9f7290bd8f3cebabf12c2e626978a?format=markdown) — 7f69350e4db9f7290bd8f3cebabf12c2e626978a; Marshall Bowers

- [Merge branch 'gpui2' of github.com:zed-industries/zed into gpui2](https://git.cafe/gitcafe/zed/commit/1a156c10600a9c379d687e93eb3c9a9e04c52ef8?format=markdown) — 1a156c10600a9c379d687e93eb3c9a9e04c52ef8; Marshall Bowers

- [Merge branch 'gpui2' into gpui2-ui](https://git.cafe/gitcafe/zed/commit/5491398a64c70d04fb89fa5b791af0d9f93c0d15?format=markdown) — 5491398a64c70d04fb89fa5b791af0d9f93c0d15; Marshall Bowers

- [Begin documenting flex styles](https://git.cafe/gitcafe/zed/commit/79e0509bf90a7e3ed8ac51fa6a7524ced27f1804?format=markdown) — 79e0509bf90a7e3ed8ac51fa6a7524ced27f1804; Marshall Bowers

- [Document gap styles](https://git.cafe/gitcafe/zed/commit/218922d9f8579ba9a4327ada60f8efcf361762cd?format=markdown) — 218922d9f8579ba9a4327ada60f8efcf361762cd; Marshall Bowers

- [Document border width styles](https://git.cafe/gitcafe/zed/commit/7a2b04a5d122605864a5acb7b7f643e90875fe6d?format=markdown) — 7a2b04a5d122605864a5acb7b7f643e90875fe6d; Marshall Bowers

- [Document rounded styles](https://git.cafe/gitcafe/zed/commit/dc32e56a9cc3b9efe912a4ad21927bf4f3b62559?format=markdown) — dc32e56a9cc3b9efe912a4ad21927bf4f3b62559; Marshall Bowers

- [Add more placeholder doc strings](https://git.cafe/gitcafe/zed/commit/490cc7ded6483068368cbde0c051e8edb7c93d6c?format=markdown) — 490cc7ded6483068368cbde0c051e8edb7c93d6c; Marshall Bowers

- [Tweak grammar](https://git.cafe/gitcafe/zed/commit/edc52e5b283a621d803c1db259874642962d929e?format=markdown) — edc52e5b283a621d803c1db259874642962d929e; Marshall Bowers

- [Document top/right/bottom/left styles](https://git.cafe/gitcafe/zed/commit/a1a12846969b9afbf3bd71738638c92c39044280?format=markdown) — a1a12846969b9afbf3bd71738638c92c39044280; Marshall Bowers

- [Document padding styles](https://git.cafe/gitcafe/zed/commit/6f849e8f6468b99fb385c340c60a194549e644d0?format=markdown) — 6f849e8f6468b99fb385c340c60a194549e644d0; Marshall Bowers

- [Document \`\.size\(\)\`](https://git.cafe/gitcafe/zed/commit/3e3250452611efaf90a63d483d6af6a961ca1460?format=markdown) — 3e3250452611efaf90a63d483d6af6a961ca1460; Marshall Bowers

- [Document margin styles](https://git.cafe/gitcafe/zed/commit/6e84d3cce00ef4cf4fa839f2ad2bba2bb64012e6?format=markdown) — 6e84d3cce00ef4cf4fa839f2ad2bba2bb64012e6; Marshall Bowers

- [Document width and height styles](https://git.cafe/gitcafe/zed/commit/8c02de6c617b3e1a2a3fbcb7e7fe62f43504ab8a?format=markdown) — 8c02de6c617b3e1a2a3fbcb7e7fe62f43504ab8a; Marshall Bowers

- [Emit doc strings for custom value setters](https://git.cafe/gitcafe/zed/commit/f09df314801d48a30fb910fbad40c8ea519fc1ab?format=markdown) — f09df314801d48a30fb910fbad40c8ea519fc1ab; Marshall Bowers

- [Add placeholder doc strings for style prefixes](https://git.cafe/gitcafe/zed/commit/6f30d6b4d034d643fb663998a6e336774ecd36e5?format=markdown) — 6f30d6b4d034d643fb663998a6e336774ecd36e5; Marshall Bowers

- [Merge branch 'gpui2-ui' into gpui2](https://git.cafe/gitcafe/zed/commit/c8b452d4119874cbe2d57941ff4825bdcd456b74?format=markdown) — c8b452d4119874cbe2d57941ff4825bdcd456b74; Marshall Bowers

- [Get everything rendering again](https://git.cafe/gitcafe/zed/commit/1a3650ef2aa181d4a599e9a32f2f3eb3c76dc09a?format=markdown) — 1a3650ef2aa181d4a599e9a32f2f3eb3c76dc09a; Nathan Sobo

- [Merge branch 'gpui2-ui' into gpui2](https://git.cafe/gitcafe/zed/commit/5e43c332f1712f5a1eb747313f94ee9e95955758?format=markdown) — 5e43c332f1712f5a1eb747313f94ee9e95955758; Marshall Bowers

- [Merge branch 'gpui2-ui' into gpui2](https://git.cafe/gitcafe/zed/commit/49caeeafcec5516f9eb1359e4e0bd37a6acf8f9f?format=markdown) — 49caeeafcec5516f9eb1359e4e0bd37a6acf8f9f; Marshall Bowers

- [Checkpoint](https://git.cafe/gitcafe/zed/commit/603765732e6dd9e4ec94cbe6a6291d1d08c15f53?format=markdown) — 603765732e6dd9e4ec94cbe6a6291d1d08c15f53; Nate Butler

- [Make all geometry types Default to support movement-based refinement](https://git.cafe/gitcafe/zed/commit/297b6b282c094093e3bcc6b4fc9627c2d35bdb6d?format=markdown) — 297b6b282c094093e3bcc6b4fc9627c2d35bdb6d; Nathan Sobo

- [WIP](https://git.cafe/gitcafe/zed/commit/fedb787b4fe6b96f509b160964a2a59eb87465e7?format=markdown) — fedb787b4fe6b96f509b160964a2a59eb87465e7; Antonio Scandurra

- [Checkpoint](https://git.cafe/gitcafe/zed/commit/90f226193c7a24bb68137e20ad2d34d6ab469c3b?format=markdown) — 90f226193c7a24bb68137e20ad2d34d6ab469c3b; Antonio Scandurra

- [Wire up call controls in the \`TitleBar\`](https://git.cafe/gitcafe/zed/commit/e477fa7a938a953083552c162a608d223a85e622?format=markdown) — e477fa7a938a953083552c162a608d223a85e622; Marshall Bowers

- [Change \`TitleBar\` to a view](https://git.cafe/gitcafe/zed/commit/f3679b37a2d526c833a4d9a89e699b3c229c942c?format=markdown) — f3679b37a2d526c833a4d9a89e699b3c229c942c; Marshall Bowers

- [Refactor button rendering to use ThemeColor instead of direct theme calls](https://git.cafe/gitcafe/zed/commit/b30b1d145cbe26252d1d4db1f409fea78db33ca3?format=markdown) — b30b1d145cbe26252d1d4db1f409fea78db33ca3; Nate Butler

- [Add example NotificationToast to workspace](https://git.cafe/gitcafe/zed/commit/e902d5d917aca7bc87b666c25ed71e5c97f0929f?format=markdown) — e902d5d917aca7bc87b666c25ed71e5c97f0929f; Nate Butler

- [Fix toast contents not filling container](https://git.cafe/gitcafe/zed/commit/8bd410742323b7d832a794bb5109809d656d362d?format=markdown) — 8bd410742323b7d832a794bb5109809d656d362d; Nate Butler

- [Hook up buttons in NotificationToast](https://git.cafe/gitcafe/zed/commit/7ba305e033c338df13005c7a38c82e588edc1f24?format=markdown) — 7ba305e033c338df13005c7a38c82e588edc1f24; Nate Butler

- [Add missing derive Element](https://git.cafe/gitcafe/zed/commit/caa0eb6e2927c7a6b34e645904a3a5cdd333056d?format=markdown) — caa0eb6e2927c7a6b34e645904a3a5cdd333056d; Nate Butler

- [Update NotificationToast implementation and use in Workspace component](https://git.cafe/gitcafe/zed/commit/c6d831a56449ee7a26137728e39ca989f605bf8c?format=markdown) — c6d831a56449ee7a26137728e39ca989f605bf8c; Nate Butler

- [Refactor NotificationToast structure to include primary and secondary actions](https://git.cafe/gitcafe/zed/commit/943c02bf799033a1b2c5bc9990858f2c991732b0?format=markdown) — 943c02bf799033a1b2c5bc9990858f2c991732b0; Nate Butler

- [Add notification toast component and remove ToastVariant from toast.rs](https://git.cafe/gitcafe/zed/commit/c32b0810293946ebe43a819eb83ab8d91cfb7ad5?format=markdown) — c32b0810293946ebe43a819eb83ab8d91cfb7ad5; Nate Butler

- [Restore elevation docs](https://git.cafe/gitcafe/zed/commit/44a30e269ece6242e23a486ac7510fb04f5dd0e9?format=markdown) — 44a30e269ece6242e23a486ac7510fb04f5dd0e9; Marshall Bowers

- [Merge branch 'main' into gpui2](https://git.cafe/gitcafe/zed/commit/ef18aaa66fbfdfdd110ecb389a105ef28184f606?format=markdown) — ef18aaa66fbfdfdd110ecb389a105ef28184f606; Marshall Bowers

- [Restore click events on \`Button\`s using \`on_mouse_down\`](https://git.cafe/gitcafe/zed/commit/36bca4f0d6ff323bcbae46f3487264de61e2bd41?format=markdown) — 36bca4f0d6ff323bcbae46f3487264de61e2bd41; Marshall Bowers

- [Use \`Workspace::view\` to construct the view](https://git.cafe/gitcafe/zed/commit/6e5ad75c5cfaf909b138e55ea1f27ed68aa9c1d9?format=markdown) — 6e5ad75c5cfaf909b138e55ea1f27ed68aa9c1d9; Marshall Bowers

- [Remove global \`WorkspaceState\`](https://git.cafe/gitcafe/zed/commit/79a61c28d7af649b57d463a10a7c5dfab4b74377?format=markdown) — 79a61c28d7af649b57d463a10a7c5dfab4b74377; Marshall Bowers

- [Fix toggling of left panel](https://git.cafe/gitcafe/zed/commit/e900ea20b7cfbefb75038ed0e2f1def312fc3733?format=markdown) — e900ea20b7cfbefb75038ed0e2f1def312fc3733; Marshall Bowers

- [Hold the story view in the \`StoryWrapper\`](https://git.cafe/gitcafe/zed/commit/8496d02fe1bd8d293df7a3ca13ff58a3b5438b7d?format=markdown) — 8496d02fe1bd8d293df7a3ca13ff58a3b5438b7d; Marshall Bowers

- [Render stories as \`View\`s](https://git.cafe/gitcafe/zed/commit/fc94c4ea40e1349352f2c8b6afd5b73f5f5d8fc1?format=markdown) — fc94c4ea40e1349352f2c8b6afd5b73f5f5d8fc1; Marshall Bowers

- [Remove debug logging in \`Element\` derive macro](https://git.cafe/gitcafe/zed/commit/c90d976d7a030a6cb047b5d17ad70461bb337c29?format=markdown) — c90d976d7a030a6cb047b5d17ad70461bb337c29; Marshall Bowers

- [Remove hacky children](https://git.cafe/gitcafe/zed/commit/d320d3a8bfe7ad5616c6a5b8f3b6752c18a0bbed?format=markdown) — d320d3a8bfe7ad5616c6a5b8f3b6752c18a0bbed; Marshall Bowers

- [Use new children approach for \`Toolbar\`](https://git.cafe/gitcafe/zed/commit/24bab48043b9ac5547ce574be87dd7fa7f3a8836?format=markdown) — 24bab48043b9ac5547ce574be87dd7fa7f3a8836; Marshall Bowers

- [Use new children approach for \`Pane\`s and \`Toast\`s](https://git.cafe/gitcafe/zed/commit/30979caf255f56f117073164c82a39c6faf17721?format=markdown) — 30979caf255f56f117073164c82a39c6faf17721; Marshall Bowers

- [Checkpoint](https://git.cafe/gitcafe/zed/commit/ce8533f83b9ca02fdf3b58bd612ce04812f9f94d?format=markdown) — ce8533f83b9ca02fdf3b58bd612ce04812f9f94d; Nathan Sobo

- [WIP](https://git.cafe/gitcafe/zed/commit/2044ccdc0b47a72fa4124e98e08d757736a8b54d?format=markdown) — 2044ccdc0b47a72fa4124e98e08d757736a8b54d; Antonio Scandurra

- [WIP](https://git.cafe/gitcafe/zed/commit/ca35573ad537cb06303fb337b1c4e20d96c7913b?format=markdown) — ca35573ad537cb06303fb337b1c4e20d96c7913b; Antonio Scandurra

- [Checkpoint: Back to a compiling state](https://git.cafe/gitcafe/zed/commit/6dbe9834618c58b9144ac185ab148442ec0e57c0?format=markdown) — 6dbe9834618c58b9144ac185ab148442ec0e57c0; Marshall Bowers

- [Checkpoint](https://git.cafe/gitcafe/zed/commit/262f5886a4ec93c7a0da2d83e7c519bfd090976d?format=markdown) — 262f5886a4ec93c7a0da2d83e7c519bfd090976d; Marshall Bowers

- [Fix issues in \`storybook2\`](https://git.cafe/gitcafe/zed/commit/207d843aee50348785d5790a9e94caa057403a3e?format=markdown) — 207d843aee50348785d5790a9e94caa057403a3e; Marshall Bowers

- [Temporarily disable click handlers](https://git.cafe/gitcafe/zed/commit/a6b872bb0c1e7749854e1cc2ec9b237c47f42cf8?format=markdown) — a6b872bb0c1e7749854e1cc2ec9b237c47f42cf8; Marshall Bowers

- [Reconcile with upstream changes](https://git.cafe/gitcafe/zed/commit/8cd112110ea7e5d6491f3718914e3bc954052faf?format=markdown) — 8cd112110ea7e5d6491f3718914e3bc954052faf; Marshall Bowers

- [Fix some merge errors](https://git.cafe/gitcafe/zed/commit/9581279919413bd55a8ecc719d1baccf66c3e044?format=markdown) — 9581279919413bd55a8ecc719d1baccf66c3e044; Marshall Bowers

- [Merge branch 'gpui2' into gpui2-ui](https://git.cafe/gitcafe/zed/commit/002458f4c8acbd54d480032cf0462c9e0fe3283d?format=markdown) — 002458f4c8acbd54d480032cf0462c9e0fe3283d; Marshall Bowers

- [Refine project panel, list item](https://git.cafe/gitcafe/zed/commit/12573ed2e7fcb84f8f059a9e664457d427c57c26?format=markdown) — 12573ed2e7fcb84f8f059a9e664457d427c57c26; Nate Butler

- [Hook up assistant panel](https://git.cafe/gitcafe/zed/commit/5477b877745473df4f4cd05c3223c36da2270f82?format=markdown) — 5477b877745473df4f4cd05c3223c36da2270f82; Marshall Bowers

- [Simplify state interactions](https://git.cafe/gitcafe/zed/commit/7478e63ea080279d6a8cb4560781be7c446091a4?format=markdown) — 7478e63ea080279d6a8cb4560781be7c446091a4; Marshall Bowers

- [Merge branch 'gpui2-ui' of github.com:zed-industries/zed into gpui2-ui](https://git.cafe/gitcafe/zed/commit/922d1462a877ac3d13564c20087c72d08a80c401?format=markdown) — 922d1462a877ac3d13564c20087c72d08a80c401; Marshall Bowers

- [Add support for switching between the project and collab panels](https://git.cafe/gitcafe/zed/commit/8f410d5e2efd40327c7f4f953bded3730e04b288?format=markdown) — 8f410d5e2efd40327c7f4f953bded3730e04b288; Marshall Bowers

More commits follow; continue with `GET /api/repos/gitcafe/zed/commits?after=ImI2YTljNTg5OTRlMDI0ZDBlYWRhOTgwZTJiNDFiYWJlMjE3OWJiMDki`.