v0.116.x stable

Bump tree-sitter-vue to remove dangling submodule
collab 0.29.2
2023-12-13 12:23:50 -05:00 · 2023-12-08 13:18:15 -05:00 · 2023-12-08 12:32:12 -05:00 · 2023-12-08 12:27:03 -05:00 · 2023-12-06 11:54:27 -08:00 · 2023-12-06 11:53:19 -08:00
7 changed files with 10 additions and 9 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -1702,7 +1702,7 @@ dependencies = [

 [[package]]
 name = "collab"
-version = "0.29.1"
+version = "0.29.2"
 dependencies = [
 "anyhow",
 "async-trait",
@ -10364,7 +10364,7 @@ dependencies = [
 [[package]]
 name = "tree-sitter-vue"
 version = "0.0.1"
-source = "git+https://github.com/zed-industries/tree-sitter-vue?rev=9b6cb221ccb8d0b956fcb17e9a1efac2feefeb58#9b6cb221ccb8d0b956fcb17e9a1efac2feefeb58"
+source = "git+https://github.com/zed-industries/tree-sitter-vue?rev=6608d9d60c386f19d80af7d8132322fa11199c42#6608d9d60c386f19d80af7d8132322fa11199c42"
 dependencies = [
 "cc",
 "tree-sitter",
@ -11706,7 +11706,7 @@ dependencies = [

 [[package]]
 name = "zed"
-version = "0.116.0"
+version = "0.116.1"
 dependencies = [
 "activity_indicator",
 "ai",
--- a/Cargo.toml
+++ b/Cargo.toml
@ -202,7 +202,7 @@ tree-sitter-yaml = { git = "https://github.com/zed-industries/tree-sitter-yaml",
 tree-sitter-lua = "0.0.14"
 tree-sitter-nix = { git = "https://github.com/nix-community/tree-sitter-nix", rev = "66e3e9ce9180ae08fc57372061006ef83f0abde7" }
 tree-sitter-nu = { git = "https://github.com/nushell/tree-sitter-nu", rev = "786689b0562b9799ce53e824cb45a1a2a04dc673"}
-tree-sitter-vue = {git = "https://github.com/zed-industries/tree-sitter-vue", rev = "9b6cb221ccb8d0b956fcb17e9a1efac2feefeb58"}
+tree-sitter-vue = {git = "https://github.com/zed-industries/tree-sitter-vue", rev = "6608d9d60c386f19d80af7d8132322fa11199c42"}
 tree-sitter-uiua = {git = "https://github.com/shnarazk/tree-sitter-uiua", rev = "9260f11be5900beda4ee6d1a24ab8ddfaf5a19b2"}

 [patch.crates-io]
--- a/assets/keymaps/default.json
+++ b/assets/keymaps/default.json
@ -18,6 +18,7 @@
      "escape": "menu::Cancel",
      "ctrl-c": "menu::Cancel",
      "cmd-shift-w": "workspace::CloseWindow",
+      "shift-escape": "workspace::ToggleZoom",
      "cmd-o": "workspace::Open",
      "cmd-=": "zed::IncreaseBufferFontSize",
      "cmd-+": "zed::IncreaseBufferFontSize",
@ -388,7 +389,6 @@
      "cmd-n": "workspace::NewFile",
      "cmd-shift-n": "workspace::NewWindow",
      "ctrl-`": "terminal_panel::ToggleFocus",
-      "shift-escape": "workspace::ToggleZoom",
      "cmd-1": ["workspace::ActivatePane", 0],
      "cmd-2": ["workspace::ActivatePane", 1],
      "cmd-3": ["workspace::ActivatePane", 2],
--- a/crates/collab/Cargo.toml
+++ b/crates/collab/Cargo.toml
@ -3,7 +3,7 @@ authors = ["Nathan Sobo <nathan@zed.dev>"]
 default-run = "collab"
 edition = "2021"
 name = "collab"
-version = "0.29.1"
+version = "0.29.2"
 publish = false

 [[bin]]
--- a/crates/collab/src/api.rs
+++ b/crates/collab/src/api.rs
@ -116,12 +116,13 @@ struct CreateUserResponse {
 #[derive(Debug, Deserialize)]
 struct Panic {
    version: String,
+    release_channel: String,
    text: String,
 }

 #[instrument(skip(panic))]
 async fn trace_panic(panic: Json<Panic>) -> Result<()> {
-    tracing::error!(version = %panic.version, text = %panic.text, "panic report");
+    tracing::error!(version = %panic.version, release_channel = %panic.release_channel, text = %panic.text, "panic report");
    Ok(())
 }

--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@ -3,7 +3,7 @@ authors = ["Nathan Sobo <nathansobo@gmail.com>"]
 description = "The fast, collaborative code editor."
 edition = "2021"
 name = "zed"
-version = "0.116.0"
+version = "0.116.1"
 publish = false

 [lib]
--- a/crates/zed/RELEASE_CHANNEL
+++ b/crates/zed/RELEASE_CHANNEL
@ -1 +1 @@
-dev
+stable
Author	SHA1	Message	Date
Joseph T. Lyons	c5bb6293e5	v0.116.x stable	2023-12-13 12:23:50 -05:00
Max Brunsfeld	1d8ed89ba7	Bump tree-sitter-vue to remove dangling submodule	2023-12-08 13:18:15 -05:00
Joseph T. Lyons	aa3ac54578	collab 0.29.2	2023-12-08 12:32:12 -05:00
Joseph T. Lyons	89be1eb813	Add release channel to panic collab upload (#3556 ) Release Notes: - N/A	2023-12-08 12:27:03 -05:00
Max Brunsfeld	b9d712ec7d	zed 0.116.1	2023-12-06 11:54:27 -08:00
Max Brunsfeld	81949cc5f2	Put ToggleZoom key binding back into the block with no context (#3516 ) Fixes a regression in zed1 from https://github.com/zed-industries/zed/pull/3491	2023-12-06 11:53:19 -08:00
Marshall Bowers	d64065cec4	v0.116.x preview	2023-12-06 12:03:39 -05:00