Skip to content
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

Jump to bottom

Update Contributor Covenant Code of Conduct to v2.1 #851

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Update Contributor Covenant Code of Conduct to v2.1 #851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fee879e
Update Code of Conduct to use Contributor Covenant 2.1
Relequestual Mar 28, 2022
d68dd7e
Merge branch 'main' into coc-cc-2-1
Relequestual Apr 21, 2022
4748496
Merge branch 'main' into coc-cc-2-1
joesepi Aug 2, 2022
4f841a1
Merge branch 'main' into coc-cc-2-1
mikesamuel Nov 8, 2022
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
11 changes: 6 additions & 5 deletions CODE_OF_CONDUCT.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](#contributor-covenant-code-of-conduct-v20) 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](#contributor-covenant-code-of-conduct) in English, and [translations](https://www.contributor-covenant.org/translations) are available on the Contributor Covenant website.

## Commitment

Expand Down Expand Up @@ -43,11 +43,12 @@ For more information, refer to the full

---

## Contributor Covenant Code of Conduct v2.0
<a id="contributor-covenant-code-of-conduct-v20"></a>
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
<a id="contributor-covenant-code-of-conduct-v20"></a>
<a id="contributor-covenant-code-of-conduct"></a>

To match the new link above.

## Contributor Covenant Code of Conduct

### Our Pledge

We as members, contributors, and leaders pledge to make participation in our 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, religion, or sexual identity and orientation.
We as members, contributors, and leaders pledge to make participation in our 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 identity and orientation.

We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community.

Expand Down Expand Up @@ -111,11 +112,11 @@ Community leaders will follow these Community Impact Guidelines in determining t

**Community Impact**: Demonstrating a pattern of violation of community standards, including sustained inappropriate behavior, harassment of an individual, or aggression toward or disparagement of classes of individuals.

**Consequence**: A permanent ban from any sort of public interaction within the project community.
**Consequence**: A permanent ban from any sort of public interaction within the community.
Copy link
Contributor

Choose a reason for hiding this comment

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

I believe that this would be a highly contentious change.

The concern, expressed by a number of maintainers in the past, is that a project could be forced by the Foundation or the CPC, to ban a contributor for their actions in a different project, without having had any transparency or say in the CoC enforcement process.

I suggest leaving this change out of this particular PR (as this would be reverting an edit made to 2.0, not updating 2.0 to 2.1) and discussing the consistency issue as part of #852.

Copy link
Member

Choose a reason for hiding this comment

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

That's not what this means though. "community" doesn't mean it must be the entire community, it just means it may be. With "project", it must not be.

Copy link
Member

Choose a reason for hiding this comment

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

IMO community reads as must and project community reads as must not.

Copy link
Member

Choose a reason for hiding this comment

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

hmm - to me, it would require a qualifier for that, because "community" is a vague, undefined term.

What about:

Suggested change
**Consequence**: A permanent ban from any sort of public interaction within the community.
**Consequence**: A permanent ban from any sort of public interaction within the community (the project, and potentially more widely).

Copy link
Member

Choose a reason for hiding this comment

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

I don't think this is the point in the doc where we should be clarifying the term "community". It's also referred to elsewhere, e.g. in the "Temporary Ban" section:

Consequence: A temporary ban from any sort of interaction or public communication with the community for a specified period of time.

To be clear, that bit is already now in our CoC.

I think the issue here is that as with our CLA, we're using an upstream text that presumes a single "project" or a single "community" as the user; we instead have the wider OpenJS Foundation "project"/"community" as an umbrella for individual named projects.

So really this upstream change isn't the issue; the issue is that we do not include a "community" definition in e.g. a preamble to this document. And that's a problem that's independent of the Contributor Covenant version we're using.

Copy link
Contributor

Choose a reason for hiding this comment

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

This is not the case. There is more than one "version 2.0". See #852 (comment)

Oof! I hadn't properly registered this. Apologies and thanks for catching it!

Unfortunately, I don't think that changes the fact that some projects will have an issue with this edit.

I think our reasonable options are:

  1. Don't upgrade for now (and allow JSON Schema to run Contributor Covenant 2.1 until we sort this out), or
  2. Update to Contributor Covenant 2.1, but keep permanent bans scoped to the project's community, or
  3. First agree on a definition of the meaning and scope of community in Change to Contributor Covenant Code of Conduct are inconsistent #852 that allows us to update to the latest version of Contributor Covenant 2.0 (EthicalSource/contributor_covenant@a63f697), and then update to Contributor Covenant 2.1.

Copy link
Member

@eemeli eemeli Apr 11, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

I don't think options 1 and 2 are viable, given that this discussion has identified the need to define "community" in this context. And as I point out above, this also matters for temporary bans, which even now target the whole "community", without a "project" qualifier.

My sense of prior discussions on this has been that we consider "community" to here mean the project's community. But let's talk about this at the CPC meeting tomorrow?

Copy link
Contributor

Choose a reason for hiding this comment

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

My sense of prior discussions on this has been that we consider "community" hear to mean the project's community. But let's talk about this at the CPC meeting tomorrow?

yes and yes

Copy link
Contributor

Choose a reason for hiding this comment

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

Was there a resolution at the meeting?

Copy link
Contributor

@mikesamuel mikesamuel Oct 18, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

Sorry, scratch that, I see @jorydotcom's explanation. Seems like this conversation could be marked resolved.


### Attribution

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

Community Impact Guidelines were inspired by [Mozilla's code of conduct enforcement ladder](https://github.com/mozilla/diversity).

Expand Down
2 changes: 1 addition & 1 deletion conduct/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ of the foundation.
## Code of Conduct

The Foundation has adopted the
[Contributor Covenant v2.0](https://www.contributor-covenant.org/version/2/0/code_of_conduct/)
[Contributor Covenant v2.1](https://www.contributor-covenant.org/version/2/1/code_of_conduct/)
as its code of conduct and it applies to all foundation activities and spaces. In
addition, projects joining the foundation are required to adopt this code of conduct
within 3 months of joining the foundation.
Expand Down
2 changes: 1 addition & 1 deletion conduct/HANDLING_CODE_OF_CONDUCT_REPORTS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ reason for reporting to coc-escalation.

## Code of Conduct

The OpenJS Foundation and its member projects use the Contributor Covenant v2.0 as its Code of Conduct. Refer to the [Code of Conduct](https://github.com/openjs-foundation/cross-project-council/blob/HEAD/CODE_OF_CONDUCT.md) for the full text of the CoC and the reporting and esclation procedures.
The OpenJS Foundation and its member projects use the Contributor Covenant v2.1 as its Code of Conduct. Refer to the [Code of Conduct](https://github.com/openjs-foundation/cross-project-council/blob/HEAD/CODE_OF_CONDUCT.md) for the full text of the CoC and the reporting and esclation procedures.

## Confidentiality and record-keeping
Personal information is confidential. All reports should be recorded, together with the discussion of it. The following private repos will be used to record and discuss reports.
Expand Down