summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2019-03-25 13:41:33 -0700
committerGitHub <noreply@github.com>2019-03-25 13:41:33 -0700
commitc7bf6f58bbe91fb54884fa403de5e5b197198891 (patch)
tree8ab414933d6339ee0da16b1ae34667cc253185e7
parent8724afb5dee263fb420fa333a198540234c680f8 (diff)
parent6675db6fb7b25827b50e4c49fb029733a073cee4 (diff)
Merge pull request #43 from Manishearth/mods
Add discord moderation subteam, fix mods mailing list
-rw-r--r--people/Khionu.toml4
-rw-r--r--people/notriddle.toml3
-rw-r--r--teams/mods-discord.toml20
-rw-r--r--teams/mods-discourse.toml16
-rw-r--r--teams/mods.toml13
5 files changed, 53 insertions, 3 deletions
diff --git a/people/Khionu.toml b/people/Khionu.toml
new file mode 100644
index 0000000..42c1270
--- /dev/null
+++ b/people/Khionu.toml
@@ -0,0 +1,4 @@
+name = "Khionu Sybiern"
+github = "Khionu"
+email = "dev@khionu.net"
+
diff --git a/people/notriddle.toml b/people/notriddle.toml
new file mode 100644
index 0000000..b072962
--- /dev/null
+++ b/people/notriddle.toml
@@ -0,0 +1,3 @@
+name = "Michael Howell"
+github = "notriddle"
+email = "notriddle+rust-mod@protonmail.com"
diff --git a/teams/mods-discord.toml b/teams/mods-discord.toml
new file mode 100644
index 0000000..185d574
--- /dev/null
+++ b/teams/mods-discord.toml
@@ -0,0 +1,20 @@
+name = "mods-discord"
+subteam-of = "mods"
+
+[people]
+leads = []
+members = [
+ "komaeda",
+ "Centril",
+ "Khionu",
+ "sgrif",
+ "technetos",
+ "pietroalbini",
+]
+
+[website]
+name = "Discord moderators"
+description = "Moderating the Discord server"
+
+[[lists]]
+address = "discord-mods@rust-lang.org"
diff --git a/teams/mods-discourse.toml b/teams/mods-discourse.toml
new file mode 100644
index 0000000..8149417
--- /dev/null
+++ b/teams/mods-discourse.toml
@@ -0,0 +1,16 @@
+name = "mods-discourse"
+subteam-of = "mods"
+
+[people]
+leads = []
+members = [
+ "notriddle",
+ "mbrubeck",
+]
+
+[website]
+name = "Discourse moderators"
+description = "Moderating users.rust-lang.org and internals.rust-lang.org"
+
+[[lists]]
+address = "discourse-mods@rust-lang.org"
diff --git a/teams/mods.toml b/teams/mods.toml
index f6c1b64..1057bcd 100644
--- a/teams/mods.toml
+++ b/teams/mods.toml
@@ -18,7 +18,14 @@ email = "rust-mods@rust-lang.org"
[[lists]]
address = "rust-mods@rust-lang.org"
-include-team-members = false
-extra-emails = [
- "rust-mods@googlegroups.com"
+
+[[lists]]
+address = "mods@rust-lang.org"
+
+[[lists]]
+address = "mods-all@rust-lang.org"
+extra-teams = [
+ "mods-discord",
+ "mods-discourse",
]
+extra-people = ["Manishearth"] # Temporary, while we focus on trying to improve moderation and stuff \ No newline at end of file