Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge rust-analyzer-contributors into rust-analyzer #1019

Merged
merged 3 commits into from
Jun 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions people/HKalbasi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ name = 'Hamidreza Kalbasi'
github = 'HKalbasi'
github-id = 45197576
email = 'hamidrezakalbasi@protonmail.com'
zulip-id = 401078
1 change: 1 addition & 0 deletions people/Veykril.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ name = "Lukas Wirth"
github = "Veykril"
github-id = 3757771
email = "lukastw97@gmail.com"
zulip-id = 300586
3 changes: 1 addition & 2 deletions people/flodiebold.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@ name = "Florian Diebold"
github = "flodiebold"
github-id = 906069
email = "flodiebold@gmail.com"


zulip-id = 129457
1 change: 1 addition & 0 deletions people/lnicola.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ name = "Laurențiu Nicola"
github = "lnicola"
github-id = 308347
email = 'lnicola@dend.ro'
zulip-id = 203546
1 change: 1 addition & 0 deletions people/matklad.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion repos/rust-lang/rust-analyzer.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ bots = ["bors", "rustbot"]

[access.teams]
rust-analyzer = "write"
rust-analyzer-contributors = "triage"

[[branch-protections]]
pattern = "master"
18 changes: 0 additions & 18 deletions teams/rust-analyzer-contributors.toml

This file was deleted.

19 changes: 17 additions & 2 deletions teams/rust-analyzer.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -17,3 +29,6 @@ bors.rust-analyzer.review = true

[[github]]
orgs = ["rust-lang", "rust-analyzer"]

[[zulip-groups]]
name = "T-rust-analyzer"
Comment on lines +33 to +34
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Once this is merged the wg-rls2 zulip group can be removed which is not managed by the team repo