From d6a5a52ee4498de01d0589f0e37b694932eb8577 Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Mon, 26 Mar 2018 15:39:26 +0200 Subject: [PATCH 1/3] Added Michael to the Core Team group --- contributing/code/core_team.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contributing/code/core_team.rst b/contributing/code/core_team.rst index 2d5463b89e4..c66dbd671a2 100644 --- a/contributing/code/core_team.rst +++ b/contributing/code/core_team.rst @@ -92,6 +92,7 @@ Active Core Members * **Jordi Boggiano** (`seldaek`_); * **Lukas Kahwe Smith** (`lsmith77`_). + * **Michael Cullum** (`michaelcullum`_) (he is also the Security Team leader) Former Core Members ~~~~~~~~~~~~~~~~~~~ @@ -231,3 +232,4 @@ discretion of the **Project Leader**. .. _`ogizanagi`: https://github.com/ogizanagi/ .. _`Nyholm`: https://github.com/Nyholm .. _`sroze`: https://github.com/sroze +.. _`michaelcullum`: https://github.com/michaelcullum From 8a56c5e894653941ca6b740d2ec36ee06d6d0e25 Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Wed, 28 Mar 2018 10:43:00 +0200 Subject: [PATCH 2/3] Added a new "Security Team" --- contributing/code/core_team.rst | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/contributing/code/core_team.rst b/contributing/code/core_team.rst index c66dbd671a2..7ca78ac4922 100644 --- a/contributing/code/core_team.rst +++ b/contributing/code/core_team.rst @@ -16,9 +16,9 @@ must adhere to said rules and protocol. Core Organization ----------------- -Symfony Core members are divided into three groups. Each member can only belong -to one group at a time. The privileges granted to a group are automatically -granted to all higher priority groups. +Symfony Core members are divided into four groups. Each member, except the +project leader, can only belong to one group at a time. The privileges granted +to a group are automatically granted to all higher priority groups. The Symfony Core groups, in descending order of priority, are as follows: @@ -27,15 +27,19 @@ The Symfony Core groups, in descending order of priority, are as follows: * Elects members in any other group; * Merges pull requests in all Symfony repositories. -2. **Mergers** +2. **Mergers Team** * Merge pull requests for the component or components on which they have been granted privileges. -3. **Deciders** +3. **Deciders Team** * Decide to merge or reject a pull request. +4. **Security Team** + +* Decide to merge or reject a pull request related to security issues. + Active Core Members ~~~~~~~~~~~~~~~~~~~ @@ -47,7 +51,7 @@ Active Core Members * **Fabien Potencier** (`fabpot`_). -* **Mergers** (``@symfony/mergers`` on GitHub): +* **Mergers Team** (``@symfony/mergers`` on GitHub): * **Tobias Schultze** (`Tobion`_) can merge into the Routing_, OptionsResolver_ and PropertyAccess_ components; @@ -88,11 +92,15 @@ Active Core Members * **Samuel Rozé** (`sroze`_) can merge into Messenger_ component. -* **Deciders** (``@symfony/deciders`` on GitHub): +* **Deciders Team** (``@symfony/deciders`` on GitHub): * **Jordi Boggiano** (`seldaek`_); * **Lukas Kahwe Smith** (`lsmith77`_). - * **Michael Cullum** (`michaelcullum`_) (he is also the Security Team leader) + +* **Security Team** (``@symfony/security`` on GitHub): + + * **Fabien Potencier** (`fabpot`_); + * **Michael Cullum** (`michaelcullum`_), Former Core Members ~~~~~~~~~~~~~~~~~~~ From b305108449910eda9a4f3f4d519d61541341cf97 Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Wed, 28 Mar 2018 15:40:25 +0200 Subject: [PATCH 3/3] Reworded --- contributing/code/core_team.rst | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/contributing/code/core_team.rst b/contributing/code/core_team.rst index 7ca78ac4922..d88272f41b8 100644 --- a/contributing/code/core_team.rst +++ b/contributing/code/core_team.rst @@ -16,9 +16,9 @@ must adhere to said rules and protocol. Core Organization ----------------- -Symfony Core members are divided into four groups. Each member, except the -project leader, can only belong to one group at a time. The privileges granted -to a group are automatically granted to all higher priority groups. +Symfony Core members are divided into four groups. Each member can only belong +to one group at a time. The privileges granted to a group are automatically +granted to all higher priority groups. The Symfony Core groups, in descending order of priority, are as follows: @@ -38,7 +38,8 @@ The Symfony Core groups, in descending order of priority, are as follows: 4. **Security Team** -* Decide to merge or reject a pull request related to security issues. +* Manage the whole security process (triaging reported vulnerabilities, fixing + the reported issues, coordinating the release of security fixes, etc.) Active Core Members ~~~~~~~~~~~~~~~~~~~