Merge remote-tracking branch 'origin/main' into panels

2023-05-23 08:24:28 +02:00 · 2023-05-23 08:24:28 +02:00 · 208ff2fba7
commit 208ff2fba7
parent f22067b236 a5b5de5651
33 changed files with 827 additions and 309 deletions
--- a/crates/collab/src/tests/integration_tests.rs
+++ b/crates/collab/src/tests/integration_tests.rs
@ -2688,6 +2688,7 @@ async fn test_git_branch_name(
    });

    let project_remote_c = client_c.build_remote_project(project_id, cx_c).await;
+    deterministic.run_until_parked();
    project_remote_c.read_with(cx_c, |project, cx| {
        assert_branch(Some("branch-2"), project, cx)
    });