Merge branch 'main' into notifications

2023-10-18 17:20:04 -07:00 · 2023-10-18 17:20:04 -07:00 · b07f9fe3b5
commit b07f9fe3b5
parent d05404a4df 199740902a
61 changed files with 3185 additions and 1148 deletions
--- a/crates/collab_ui/src/chat_panel/message_editor.rs
+++ b/crates/collab_ui/src/chat_panel/message_editor.rs
@ -232,7 +232,7 @@ mod tests {
                            avatar: None,
                        }),
                        kind: proto::channel_member::Kind::Member,
-                        admin: false,
+                        role: proto::ChannelRole::Member,
                    },
                    ChannelMembership {
                        user: Arc::new(User {
@ -241,7 +241,7 @@ mod tests {
                            avatar: None,
                        }),
                        kind: proto::channel_member::Kind::Member,
-                        admin: false,
+                        role: proto::ChannelRole::Member,
                    },
                ],
                cx,