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.

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

Update CoC from Contributor Covenant 1.4 to 2.0 #418

Merged
merged 1 commit into from
Jan 28, 2020

Conversation

eemeli
Copy link
Member

@eemeli eemeli commented Dec 3, 2019

Version 2.0 of our upstream code of conduct, the Contributor Covenant, has been released. The project's changelog has not (yet) been updated, but by manual comparison the update appears to bring two major updates:

  1. The initial pledge has an additional second part:

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

  2. The "Enforcement Guidelines" section has been added, detailing actions that community leaders may take in response to infractions.

All other changes appear to be superficial.

This PR updates our references to "v1.4.1" of the Contributor Covenant to refer to its "v2.0" instead. The covenant claims to follow semver, but does not appear to actually publish enumerated patch releases separately; hence dropping the patch number.

This PR is related to #413, which makes our references to the covenant's version more explicit. If/once one of these is merged, the other will need to be amended.

Copy link
Member

@ljharb ljharb left a comment

Choose a reason for hiding this comment

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

This might need approval from every member project first?

@bnb
Copy link
Member

bnb commented Dec 5, 2019

FWIW Node.js will need to update its code of conduct too - I can PR this change: https://github.com/nodejs/admin/blob/master/CODE_OF_CONDUCT.md

Copy link
Member

@mhdawson mhdawson left a comment

Choose a reason for hiding this comment

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

LGTM

@MylesBorins
Copy link
Contributor

I personally think we might want to consider having the full text here. Good not to force folks to go to a third party we have no control over for this.

@eemeli
Copy link
Member Author

eemeli commented Jan 7, 2020

Rebased to account for #413 being merged. The upstream CoC v2.0 is now inlined.

Copy link
Member

@mhdawson mhdawson left a comment

Choose a reason for hiding this comment

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

LGTM with inline content.

Copy link
Member

@joesepi joesepi left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks

Copy link
Member

@mcollina mcollina left a comment

Choose a reason for hiding this comment

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

lgtm

@eemeli eemeli merged commit 72754c6 into openjs-foundation:master Jan 28, 2020
@eemeli eemeli deleted the coc-v2 branch January 28, 2020 17:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.