From 16abba355a50fd01281f305f8404809781824a1c Mon Sep 17 00:00:00 2001 From: Lukas Wirth Date: Mon, 19 Jun 2023 22:48:10 +0200 Subject: [PATCH 1/3] Merge rust-analyzer-contributors into rust-analyzer --- repos/rust-lang/rust-analyzer.toml | 1 - teams/rust-analyzer-contributors.toml | 18 ------------------ teams/rust-analyzer.toml | 16 ++++++++++++++-- 3 files changed, 14 insertions(+), 21 deletions(-) delete mode 100644 teams/rust-analyzer-contributors.toml diff --git a/repos/rust-lang/rust-analyzer.toml b/repos/rust-lang/rust-analyzer.toml index f6c3ad89b..bc3824932 100644 --- a/repos/rust-lang/rust-analyzer.toml +++ b/repos/rust-lang/rust-analyzer.toml @@ -5,7 +5,6 @@ bots = ["bors", "rustbot"] [access.teams] rust-analyzer = "write" -rust-analyzer-contributors = "triage" [[branch-protections]] pattern = "master" diff --git a/teams/rust-analyzer-contributors.toml b/teams/rust-analyzer-contributors.toml deleted file mode 100644 index 2398da867..000000000 --- a/teams/rust-analyzer-contributors.toml +++ /dev/null @@ -1,18 +0,0 @@ -name = "rust-analyzer-contributors" -subteam-of = "compiler" - -[people] -leads = [] -members = [ - "bjorn3", - "edwin0cheng", - "SomeoneToIgnore", - "lowr", - "HKalbasi", -] - -[permissions] -bors.rust-analyzer.review = true - -[[github]] -orgs = ["rust-lang", "rust-analyzer"] diff --git a/teams/rust-analyzer.toml b/teams/rust-analyzer.toml index 75e8a5427..79eb22d86 100644 --- a/teams/rust-analyzer.toml +++ b/teams/rust-analyzer.toml @@ -3,8 +3,20 @@ subteam-of = "compiler" [people] leads = ["Veykril"] -members = ["matklad", "lnicola", "Veykril", "flodiebold"] -alumni = ["jonas-schievink"] +members = [ + "matklad", + "lnicola", + "Veykril", + "flodiebold", + "bjorn3", + "lowr", + "HKalbasi", +] +alumni = [ + "jonas-schievink", + "edwin0cheng", + "SomeoneToIgnore", +] [website] name = "rust-analyzer team" From a272fc34ca734ad69ba65a00ff9fad1a3b6d23f1 Mon Sep 17 00:00:00 2001 From: Lukas Wirth Date: Mon, 19 Jun 2023 22:48:18 +0200 Subject: [PATCH 2/3] Add zulip group for rust-analyzer --- teams/rust-analyzer.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/teams/rust-analyzer.toml b/teams/rust-analyzer.toml index 79eb22d86..7c0f49547 100644 --- a/teams/rust-analyzer.toml +++ b/teams/rust-analyzer.toml @@ -29,3 +29,6 @@ bors.rust-analyzer.review = true [[github]] orgs = ["rust-lang", "rust-analyzer"] + +[[zulip-groups]] +name = "T-rust-analyzer" From 8f16f922810a690553e9c49018bce7edbf94e989 Mon Sep 17 00:00:00 2001 From: Lukas Wirth Date: Tue, 20 Jun 2023 08:37:47 +0200 Subject: [PATCH 3/3] Add missing zulip ids --- people/HKalbasi.toml | 1 + people/Veykril.toml | 1 + people/flodiebold.toml | 3 +-- people/lnicola.toml | 1 + people/matklad.toml | 1 + 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/people/HKalbasi.toml b/people/HKalbasi.toml index b14479afa..08e6f94b7 100644 --- a/people/HKalbasi.toml +++ b/people/HKalbasi.toml @@ -2,3 +2,4 @@ name = 'Hamidreza Kalbasi' github = 'HKalbasi' github-id = 45197576 email = 'hamidrezakalbasi@protonmail.com' +zulip-id = 401078 diff --git a/people/Veykril.toml b/people/Veykril.toml index b67c4f83d..96a1011bb 100644 --- a/people/Veykril.toml +++ b/people/Veykril.toml @@ -2,3 +2,4 @@ name = "Lukas Wirth" github = "Veykril" github-id = 3757771 email = "lukastw97@gmail.com" +zulip-id = 300586 diff --git a/people/flodiebold.toml b/people/flodiebold.toml index 641e1aa0e..883371898 100644 --- a/people/flodiebold.toml +++ b/people/flodiebold.toml @@ -2,5 +2,4 @@ name = "Florian Diebold" github = "flodiebold" github-id = 906069 email = "flodiebold@gmail.com" - - +zulip-id = 129457 diff --git a/people/lnicola.toml b/people/lnicola.toml index 16528a8ac..0a6e09b70 100644 --- a/people/lnicola.toml +++ b/people/lnicola.toml @@ -2,3 +2,4 @@ name = "Laurențiu Nicola" github = "lnicola" github-id = 308347 email = 'lnicola@dend.ro' +zulip-id = 203546 diff --git a/people/matklad.toml b/people/matklad.toml index 993003726..b921af4ae 100644 --- a/people/matklad.toml +++ b/people/matklad.toml @@ -2,6 +2,7 @@ name = "Aleksey Kladov" github = "matklad" github-id = 1711539 email = "aleksey.kladov@gmail.com" +zulip-id = 133169 [permissions] bors.vscode-rust.review = true