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

2022-10-10 15:43:38 +02:00 · 2022-10-10 15:43:38 +02:00 · afaacba41f
commit afaacba41f
parent 3396a98978 e96abf1429
92 changed files with 10800 additions and 6586 deletions
--- a/crates/zed/src/menus.rs
+++ b/crates/zed/src/menus.rs
@ -328,6 +328,11 @@ pub fn menus() -> Vec<Menu<'static>> {
                    action: Box::new(command_palette::Toggle),
                },
                MenuItem::Separator,
+                MenuItem::Action {
+                    name: "View Telemetry Log",
+                    action: Box::new(crate::OpenTelemetryLog),
+                },
+                MenuItem::Separator,
                MenuItem::Action {
                    name: "Documentation",
                    action: Box::new(crate::OpenBrowser {