8000 Updated Code of Conduct text to version 2.1 of the Contributor Covenant by TimoBakx · Pull Request #16442 · symfony/symfony-docs · GitHub
[go: up one dir, main page]

Skip to content

Updated Code of Conduct text to version 2.1 of the Contributor Covenant #16442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 31, 2022
Merged

Updated Code of Conduct text to version 2.1 of the Contributor Covenant #16442

merged 1 commit into from
Jan 31, 2022

Conversation

TimoBakx
Copy link
Member
@TimoBakx TimoBakx commented Jan 24, 2022

The current text of the Code of Conduct is based on version 1.4 of the Contributors Covenant. This PR updates the text to the 2.1 version of that document.

Original 1.4 version: https://www.contributor-covenant.org/version/1/4/code-of-conduct/
Original 2.1 version: https://www.contributor-covenant.org/version/2/1/code_of_conduct/

Changes:

  • Deleted separate CODE_OF_CONDUCT.md in favor of symfony/.github/CODE_OF_CONDUCT.md (which links to the documentation).
  • Deleted separate .github/CODE_OF_CONDUCT.md in favor of symfony/.github/CODE_OF_CONDUCT.md.
  • Updated the text of the .rst version of the Code of Conduct (which all other files link to)

Copy link
Member
@wouterj wouterj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good to go from a doc point of view!

@javiereguiluz
Copy link
Member

@TimoBakx from the point of view of Docs Team this is ready to be merged. So, just asking: is this change a proposal to be decided by the Diversity Team and/or Community ... or is this an already made decision by the Diversity Team? Thanks!

@TimoBakx
Copy link
Member Author

@javiereguiluz The change was proposed within the CARE team. The text itself has not yet been reviewed. I've requested a review in both the CARE team and Diversity Slack channels.

Copy link
Member
@Nyholm Nyholm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great work. Thank you.

Im part of the CARE team. I approve this.
The update from 1.4 to 2.1 is "maintenance" work. Ie updating our dependencies.

The 2.1 document also very much aligns with the training we've got.

nicolas-grekas added a commit to symfony/symfony that referenced this pull request Jan 26, 2022
…akx)

This PR was merged into the 4.4 branch.

Discussion
----------

Replaced full CoC text with link to documentation

| Q             | A
| ------------- | ---
| Branch?       | 4.4
| Bug fix?      | no
| New feature?  | no
| Deprecations? | no
| Tickets       |
| License       | MIT
| Doc PR        | symfony/symfony-docs#16442

This ensures that we have 1 single source for the full text and not multiple versions in different repositories.

Commits
-------

e880832 Replaced full CoC text with link to documentation
@javiereguiluz
Copy link
Member

Thank you Timo.

@javiereguiluz javiereguiluz merged commit 5d21247 into symfony:4.4 Jan 31, 2022
@TimoBakx TimoBakx deleted the coc-update-2.1 branch January 31, 2022 08:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants
0