Skip to content

doc: update contributor covenant code of conduct to v2.1 #1065

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.

Sign up for GitHub

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

Closed
wants to merge 1 commit into from
Closed

doc: update contributor covenant code of conduct to v2.1 #1065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 1 addition & 36 deletions conduct/artifacts/CODE_OF_CONDUCT_PATCH.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,10 @@
---

-# Contributor Covenant Code of Conduct
+_Contributor Covenant Code of Conduct v2.0, from [commit 8001bf8](https://github.com/EthicalSource/contributor_covenant/blob/8001bf8c6e7cd2606657e2816710770d8a79b7dc/content/version/2/0/code_of_conduct.md)_
+_Contributor Covenant Code of Conduct v2.1, from [commit 8a3be13](https://github.com/EthicalSource/contributor_covenant/blob/8a3be1350b07f38b53bbc7073f765a48c4c53ce1/content/version/2/1/code_of_conduct.md)_

## Our Pledge

@@ -51,7 +51,7 @@
community a harassment-free experience for everyone, regardless of age, body
size, visible or invisible disability, ethnicity, sex characteristics, gender
identity and expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, caste, color, religion, or sexual
+nationality, personal appearance, race, religion, or sexual
identity and orientation.

We pledge to act and interact in ways that contribute to an open, welcoming,
@@ -105,7 +105,9 @@

Instances of abusive, harassing, or otherwise unacceptable behavior may be
Expand All @@ -29,29 +20,3 @@
All complaints will be reviewed and investigated promptly and fairly.

All community leaders are obligated to respect the privacy and security of the
@@ -155,13 +157,13 @@
individual, or aggression toward or disparagement of classes of individuals.

**Consequence**: A permanent ban from any sort of public interaction within the
-community.
+project community.
Comment on lines -35 to -37
Copy link
Member

Choose a reason for hiding this comment

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

Dropping this diff between our version and the upstream is the core reason why the earlier conversation on updating to 2.1 stalled, and it should not pass here without comment or question.

The meaning of "community" needs to be clarified. If a permanent ban is applied to an individual, are they:

  1. Banned from interacting within the community of the project in which they've misbehaved, or
  2. Banned from interacting within any and all OpenJS project communities?

My preferred option here would be to include some text in the preamble clarifying the term and its interpretation.

Our Contributor License Agreement refers to the whole of the foundation as one "Project", in order to keep the base Apache CLA unmodified. I mention this because in addition to the CoC, as far as I know that's the one other document that we're asking community members to accede to.

Copy link
Member

Choose a reason for hiding this comment

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

Clarifying it sounds great. The Foundation afaik doesn't and imo shouldn't have the ability to ban anyone across all OpenJS projects - that's up to each project.


## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 2.1, available at
-[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
+version 2.0, available at
+[https://www.contributor-covenant.org/version/2/0/code_of_conduct.html][v2.0].

Community Impact Guidelines were inspired by
[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
@@ -171,7 +173,7 @@
[https://www.contributor-covenant.org/translations][translations].

[homepage]: https://www.contributor-covenant.org
-[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
+[v2.0]: https://www.contributor-covenant.org/version/2/0/code_of_conduct.html
[Mozilla CoC]: https://github.com/mozilla/diversity
[FAQ]: https://www.contributor-covenant.org/faq
[translations]: https://www.contributor-covenant.org/translations
2 changes: 1 addition & 1 deletion conduct/artifacts/CODE_OF_CONDUCT_PREAMBLE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Code of Conduct

The OpenJS Foundation and its member projects use [Contributor Covenant v2.0](https://contributor-covenant.org/version/2/0/code_of_conduct) as their code of conduct. The full text is included below in English, and [translations](https://www.contributor-covenant.org/translations) are available on the Contributor Covenant website.
The OpenJS Foundation and its member projects use [Contributor Covenant v2.1](https://contributor-covenant.org/version/2/1/code_of_conduct) as their code of conduct. The full text is included below in English, and [translations](https://www.contributor-covenant.org/translations) are available on the Contributor Covenant website.

## Commitment

Expand Down