Skip to content

Commit a82ca49

Browse files
committed
Merge branch '7.2' into 7.3
* 7.2: Remove some unnecessary blank lines in some lists
2 parents ba6944a + f9e2c7b commit a82ca49

File tree

1 file changed

+3
-14
lines changed

1 file changed

+3
-14
lines changed

contributing/code/core_team.rst

+3-14
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,9 @@ Role of a Core Team Member
1818

1919
In addition to being a regular contributor, core team members are expected to:
2020

21-
* Review, approve, and merge pull requests;
22-
23-
* Help enforce, improve, and implement Symfony :doc:`processes and policies </contributing/index>`;
24-
25-
* Participate in the Symfony Core Team discussions (on Slack and GitHub).
21+
* Review, approve, and merge pull requests;
22+
* Help enforce, improve, and implement Symfony :doc:`processes and policies </contributing/index>`;
23+
* Participate in the Symfony Core Team discussions (on Slack and GitHub).
2624

2725
Core Organization
2826
-----------------
@@ -46,9 +44,7 @@ In addition, there are other groups created to manage specific topics:
4644

4745
* **Security Team**: manages the whole security process (triaging reported vulnerabilities,
4846
fixing the reported issues, coordinating the release of security fixes, etc.);
49-
5047
* **Symfony UX Team**: manages the `UX repositories`_;
51-
5248
* **Documentation Team**: manages the whole `symfony-docs repository`_.
5349

5450
Active Core Members
@@ -152,7 +148,6 @@ Pull Request Voting Policy
152148

153149
* Core members can change their votes as many times as they desire
154150
during the course of a pull request discussion;
155-
156151
* Core members are not allowed to vote on their own pull requests.
157152

158153
Pull Request Merging Policy
@@ -161,13 +156,10 @@ Pull Request Merging Policy
161156
A pull request **can be merged** if:
162157

163158
* It is a :ref:`minor change <core-team_minor-changes>`;
164-
165159
* Enough time was given for peer reviews;
166-
167160
* It is a bug fix and at least two **Mergers Team** members voted ``+1``
168161
(only one if the submitter is part of the Mergers team) and no Core
169162
member voted ``-1`` (via GitHub reviews or as comments).
170-
171163
* It is a new feature and at least two **Mergers Team** members voted
172164
``+1`` (if the submitter is part of the Mergers team, two *other* members)
173165
and no Core member voted ``-1`` (via GitHub reviews or as comments).
@@ -187,15 +179,12 @@ following these rules:
187179

188180
* **Feature**: For new features and deprecations; Pull requests must be merged
189181
in the development branch.
190-
191182
* **Bug**: Only for bug fixes; We are very conservative when it comes to
192183
merging older, but still maintained, branches. Read the :doc:`maintenance`
193184
document for more information.
194-
195185
* **Minor**: For everything that does not change the code or when they don't
196186
need to be listed in the CHANGELOG files: typos, Markdown files, test files,
197187
new or missing translations, etc.
198-
199188
* **Security**: It's the category used for security fixes and should never be
200189
used except by the security team.
201190

0 commit comments

Comments
 (0)