Skip to content

Commit 7b2fec4

Browse files
authored
Don't encourage or require first-time contributors to sign the PCA before submitting a pull request (#1838)
Our friendly `mr.roboto` bot nags them to do so. And our docs warn them that we may ignore or close PRs for people who don't bother to read and follow our guidelines. Also clean up some wording and grammar.
1 parent b0c87fb commit 7b2fec4

File tree

2 files changed

+10
-15
lines changed

2 files changed

+10
-15
lines changed

docs/contributing/first-time.md

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,7 @@ Such motivation behind these contributions usually results in poor quality break
6767
## Requirements
6868

6969
All first-time contributors to Plone must follow the contributing requirements described in {doc}`index`.
70-
**Do this step now.**
71-
If you skip this step, then your contribution can't be accepted.
70+
Although you can open a pull request at any time, Plone Team members may ignore it until, or close it unless, you satisfy the contributing requirements.
7271

7372
For [Plone Google Summer of Code (GSoC)](https://plone.org/community/gsoc) applicants, you must also follow both our and its program guidelines.
7473

@@ -80,10 +79,6 @@ For [Plone Google Summer of Code (GSoC)](https://plone.org/community/gsoc) appli
8079
Contributions to Plone are managed through git repositories on GitHub.
8180
This section first discusses what not to do, then how to work effectively with a project on GitHub.
8281

83-
```{danger}
84-
Only people who have completed the {ref}`first-time-requirements-label` described above should make contributions.
85-
```
86-
8782

8883
(things-not-to-do-label)=
8984

@@ -95,8 +90,8 @@ Learn from their mistakes, and don't commit them yourself.
9590
(mistake-1-label)=
9691

9792
1. **Never ask to be assigned to an issue.**
98-
If an issue is unclaimed—either by assignment, an open pull request, or an explicit comment such as "I am working on this issue"—then it is available to work on by **any member of a Plone Team in GitHub**.
99-
As a member of a Plone Team, you may post a comment in any unclaimed issue to claim it.
93+
If an issue is claimed—either by assignment, an open pull request, or an explicit comment such as "I am working on this issue"—then it is not available to work on.
94+
Otherwise, it is available, and you must claim it before you start work on it.
10095
See {ref}`Avoid duplicate effort <mistake-2-label>`.
10196
Privileged Plone Team members may ignore or delete comments asking to be assigned to an issue.
10297

@@ -116,7 +111,7 @@ Learn from their mistakes, and don't commit them yourself.
116111
You should instead learn how to {ref}`work-with-github-issues-label` and {ref}`run tests and code quality checks locally <test-and-code-quality-label>`.
117112

118113
4. **Don't ask if an issue is open.**
119-
Instead you can determine whether an issue is open by doing your own research using the following tips.
114+
Instead, you can determine whether an issue is open by doing your own research using the following tips.
120115

121116
- Start Plone or its specific package, follow the steps to attempt to reproduce the issue, and see if it still exists.
122117
- Check the issue's status indicator for a green label of {guilabel}`Open`.
@@ -142,11 +137,11 @@ New contributors should wait for an invitation to join this team, and accept it,
142137

143138
### `mr-roboto` on GitHub
144139

145-
[`mr-roboto`](https://github.com/plone/mr.roboto) enforces the requirement of a signed Plone Contributor Agreement from a new contributor, and being assigned to a Plone team on GitHub.
140+
[`mr-roboto`](https://github.com/plone/mr.roboto) enforces the requirement of a signed Plone Contributor Agreement from all contributors by virtue of being assigned to a Plone Team on GitHub.
146141

147-
New contributors to Plone who submit a pull request and do not wait for confirmation that they have been added to the Contributors team will be subjected to persistent nagging from `mr-roboto`.
148-
`mr-roboto` will not respond to you if you `@` it.
149-
Core developers may ignore your contribution because you did not follow these instructions.
142+
New contributors to Plone who submit a pull request and do not wait for confirmation that they have been added to the Contributors Team will be subjected to persistent nagging from `mr-roboto`.
143+
`mr-roboto` will not respond to you if you `@` it, and if you do that anyway, then that indicates you did not read these guidelines.
144+
Plone Team members may ignore or close your contribution because you did not follow these instructions.
150145
Please don't be "that person".
151146

152147

@@ -183,7 +178,7 @@ After you have satisfied the above steps and have clear direction on how to proc
183178

184179
As a member of the Plone Contributors Team, you do not have write access to push commits to GitHub repositories under the Plone organization.
185180
You can push commits to your fork.
186-
Thus a typical workflow will be circular in nature.
181+
Thus, a typical workflow will be circular in nature.
187182
You will pull code from the upstream Plone repository, push your work from your local clone to your remote fork, then make a pull request from your fork to the upstream Plone repository.
188183

189184
````{card}

docs/contributing/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ A volunteer member of the Plone Foundation will review your signed agreement.
3434
If accepted, your GitHub account will be added to a team in the Plone GitHub organization with appropriate access, and you will simultaneously receive an email from GitHub for you to accept the invitation to join the team.
3535

3636
Allow up to one week for processing.
37-
Contact the Plone Foundation by its email address for further information, including the status of your request.
37+
Contact the Plone Foundation at [email protected] for further information, including the status of your request.
3838

3939
```{button-link} https://plone.org/foundation/contributors-agreement
4040
:color: primary

0 commit comments

Comments
 (0)