10000 minor #12111 Simplify the core team processes (fabpot) · symfony/symfony-docs@fca8efc · GitHub
[go: up one dir, main page]
Skip to content

Commit fca8efc

Browse files
xabbuhxabbuh
committed
minor #12111 Simplify the core team processes (fabpot)
This PR was merged into the 3.4 branch. Discussion ---------- Simplify the core team processes To better reflect the reality of how we are working nowadays. Commits ------- 5f6e9d6 simplified the core team processes
2 parents 2090c28 + 5f6e9d6 commit fca8efc

File tree

1 file changed

+27
-82
lines changed

1 file changed

+27
-82
lines changed

‎contributing/code/core_team.rst

Lines changed: 27 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ The Symfony Core groups, in descending order of priority, are as follows:
2929

3030
2. **Mergers Team**
3131

32-
* Merge pull requests for the component or components on which they have been
33-
granted privileges.
32+
* Merge pull requests on the main Symfony repository.
3433

3534
In addition, there are other groups created to manage specific topics:
3635

@@ -39,6 +38,10 @@ In addition, there are other groups created to manage specific topics:
3938
* Manage the whole security process (triaging reported vulnerabilities, fixing
4039
the reported issues, coordinating the release of security fixes, etc.)
4140

41+
**Recipes Team**
42+
43+
* Manage the recipes in the main and contrib recipe repositories.
44+
4245
**Documentation Team**
4346

4447
* Manage the whole `symfony-docs repository`_.
@@ -52,50 +55,30 @@ Active Core Members
5255

5356
* **Mergers Team** (``@symfony/mergers`` on GitHub):
5457

55-
* **Nicolas Grekas** (`nicolas-grekas`_) can merge into all components,
56-
bridges and bundles;
57-
58-
* **Christophe Coevoet** (`stof`_) can merge into all components, bridges and
59-
bundles;
60-
61-
* **Christian Flothmann** (`xabbuh`_) can merge into all components,
62-
bridges and bundles;
63-
64-
* **Tobias Schultze** (`Tobion`_) can merge into the Routing_,
65-
OptionsResolver_ and PropertyAccess_ components;
66-
67-
* **Kévin Dunglas** (`dunglas`_) can merge into the PropertyInfo_ and the Serializer_
68-
component;
69-
70-
* **Jakub Zalas** (`jakzal`_) can merge into the DomCrawler_ and Intl_
71-
components;
72-
73-
* **Javier Eguiluz** (`javiereguiluz`_) can merge into the WebProfilerBundle_;
74-
75-
* **Grégoire Pineau** (`lyrixx`_) can merge into the Workflow_ component;
76-
77-
* **Ryan Weaver** (`weaverryan`_) can merge into the Security_ component and
78-
the SecurityBundle_;
79-
80-
* **Robin Chalas** (`chalasr`_) can merge into the Console_ and Security_
81-
components and the SecurityBundle_;
82-
83-
* **Maxime Steinhausser** (`ogizanagi`_) can merge into Config_, Console_,
84-
Form_, Serializer_, DependencyInjection_, and HttpKernel_ components;
85-
86-
* **Tobias Nyholm** (`Nyholm`_) manages the official and contrib recipes
87-
repositories;
88-
89-
* **Samuel Rozé** (`sroze`_) can merge into the Messenger_ component.
90-
91-
* **Yonel Ceruto** (`yceruto`_) can merge into the ErrorRenderer,
92-
OptionsResolver_, and Form_ components and TwigBundle_.
58+
* **Nicolas Grekas** (`nicolas-grekas`_);
59+
* **Christophe Coevoet** (`stof`_);
60+
* **Christian Flothmann** (`xabbuh`_);
61+
* **Tobias Schultze** (`Tobion`_);
62+
* **Kévin Dunglas** (`dunglas`_);
63+
* **Jakub Zalas** (`jakzal`_);
64+
* **Javier Eguiluz** (`javiereguiluz`_);
65+
* **Grégoire Pineau** (`lyrixx`_);
66+
* **Ryan Weaver** (`weaverryan`_);
67+
* **Robin Chalas** (`chalasr`_);
68+
* **Maxime Steinhausser** (`ogizanagi`_);
69+
* **Samuel Rozé** (`sroze`_);
70+
* **Yonel Ceruto** (`yceruto`_).
9371

9472
* **Security Team** (``@symfony/security`` on GitHub):
9573

9674
* **Fabien Potencier** (`fabpot`_);
9775
* **Michael Cullum** (`michaelcullum`_).
9876

77+
* **Recipes Team**:
78+
79+
* **Fabien Potencier** (`fabpot`_);
80+
* **Tobias Nyholm** (`Nyholm`_).
81+
9982
* **Documentation Team** (``@symfony/team-symfony-docs`` on GitHub):
10083

10184
* **Fabien Potencier** (`fabpot`_);
@@ -162,11 +145,11 @@ A pull request **can be merged** if:
162145

163146
* It is a minor change [1]_;
164147

165-
* Enough time was given for peer reviews (at least 2 days for "regular"
166-
pull requests, and 4 days for pull requests with "a significant impact");
148+
* Enough time was given for peer reviews;
167149

168-
* At least the component's **Merger** or two other Core members voted ``+1``
169-
and no Core member voted ``-1``.
150+
* At least two **Merger Team** members voted ``+1`` (only one if the submitter
151+
is part of the Merger team) and no Core member voted ``-1`` (via Github
152+
reviews or as comments).
170153

171154
Pull Request Merging Process
172155
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -191,44 +174,6 @@ discretion of the **Project Leader**.
191174
.. [1] Minor changes comprise typos, DocBlock fixes, code standards
192175
violations, and minor CSS, JavaScript and HTML modifications.
193176
194-
.. _PhpUnitBridge: https://github.com/symfony/phpunit-bridge
195-
.. _BrowserKit: https://github.com/symfony/browser-kit
196-
.. _Cache: https://github.com/symfony/cache
197-
.. _Config: https://github.com/symfony/config
198-
.. _Console: https://github.com/symfony/console
199-
.. _Debug: https://github.com/symfony/debug
200-
.. _DebugBundle: https://github.com/symfony/debug-bundle
201-
.. _DependencyInjection: https://github.com/symfony/dependency-injection
202-
.. _DoctrineBridge: https://github.com/symfony/doctrine-bridge
203-
.. _EventDispatcher: https://github.com/symfony/event-dispatcher
204-
.. _DomCrawler: https://github.com/symfony/dom-crawler
205-
.. _ErrorRenderer: https://github.com/symfony/error-renderer
206-
.. _Form: https://github.com/symfony/form
207-
.. _HttpFoundation: https://github.com/symfony/http-foundation
208-
.. _HttpKernel: https://github.com/symfony/http-kernel
209-
.. _Icu: https://github.com/symfony/icu
210-
.. _Intl: https://github.com/symfony/intl
211-
.. _LDAP: https://github.com/symfony/ldap
212-
.. _Locale: https://github.com/symfony/locale
213-
.. _Messenger: https://github.com/symfony/messenger
214-
.. _MonologBridge: https://github.com/symfony/monolog-bridge
215-
.. _OptionsResolver: https://github.com/symfony/options-resolver
216-
.. _Process: https://github.com/symfony/process
217-
.. _PropertyAccess: https://github.com/symfony/property-access
218-
.. _PropertyInfo: https://github.com/symfony/property-info
219-
.. _Routing: https://github.com/symfony/routing
220-
.. _Serializer: https://github.com/symfony/serializer
221-
.. _Translation: https://github.com/symfony/translation
222-
.. _Security: https://github.com/symfony/security
223-
.. _SecurityBundle: https://github.com/symfony/security-bundle
224-
.. _Stopwatch: https://github.com/symfony/stopwatch
225-
.. _TwigBridge: https://github.com/symfony/twig-bridge
226-
.. _TwigBundle: https://github.com/symfony/twig-bundle
227-
.. _Validator: https://github.com/symfony/validator
228-
.. _VarDumper: https://github.com/symfony/var-dumper
229-
.. _Workflow: https://github.com/symfony/workflow
230-
.. _Yaml: https://github.com/symfony/yaml
231-
.. _WebProfilerBundle: https://github.com/symfony/web-profiler-bundle
232177
.. _`symfony-docs repository`: https://github.com/symfony/symfony-docs
233178
.. _`fabpot`: https://github.com/fabpot/
234179
.. _`webmozart`: https://github.com/webmozart/

0 commit comments

Comments
 (0)
0