Skip to content

Commit

Permalink
Update Code of Conduct to use Contributor Covenant 2.1
Browse files Browse the repository at this point in the history
Note: Remove "project" in updating to 2.1, but was actually a later re-publish of 2.0.
See openjs-foundation#852
Also auto removed trailing white space on save. Ignore white space to diff
  • Loading branch information
Relequestual committed Apr 4, 2022
1 parent 29a493a commit fee879e
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
11 changes: 6 additions & 5 deletions CODE_OF_CONDUCT.md
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) 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>
## 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.

### 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
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
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

0 comments on commit fee879e

Please sign in to comment.