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

doc: update list of personal traits in CoC #4801

Closed
wants to merge 1 commit into from

Conversation

zkat
Copy link
Contributor

@zkat zkat commented Jan 21, 2016

rust-lang/prev.rust-lang.org#288 landed in the Rust repo so it seems like a good idea to just bring the updated list in.

We also received a request to do this in nodejs/inclusivity#82 so this should resolve that.

This PR would preferably also be merged into LTS, imo.

/cc @nodejs/inclusivity @nodejs/lts @nodejs/documentation

@zkat zkat added the doc Issues and PRs related to the documentations. label Jan 21, 2016
@ghost
Copy link

ghost commented Jan 21, 2016

cc @Charlotteis

@zkat
Copy link
Contributor Author

zkat commented Jan 21, 2016

@sup yes, that is perfectly valid in English.

@@ -4,8 +4,10 @@ This Code of Conduct is adapted from [Rust's wonderful
CoC](http://www.rust-lang.org/conduct.html).
Copy link

Choose a reason for hiding this comment

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

I believe Rust adapted this from the Contributor Covenant so that might be worth including in the first sentence about adaptations?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed

@varjmes
Copy link

varjmes commented Jan 21, 2016

is this supposed to say characteristic in singular?

I think it works how it is, yeah.

@Fishrock123
Copy link
Contributor

LGTM. This isn't actually a policy change, so there's no reason for this to go to a CTC meeting imo.

@varjmes
Copy link

varjmes commented Jan 21, 2016

Thanks very much @zkat

@Fishrock123 Fishrock123 added the meta Issues and PRs related to the general management of the project. label Jan 21, 2016
@ghost
Copy link

ghost commented Jan 21, 2016

@Charlotteis @zkat ok thanks! wasn't sure

@zkat zkat changed the title doc: update list of personal trais in CoC doc: update list of personal traits in CoC Jan 21, 2016
@MylesBorins
Copy link
Contributor

lgtm... I especially like the inclusion of level of experience

@benjamingr
Copy link
Member

Very nice update. I'm glad the org is taking this direction.

@jasnell
Copy link
Member

jasnell commented Jan 21, 2016

LGTM

@jasnell
Copy link
Member

jasnell commented Jan 21, 2016

I agree with @Fishrock123 ... there shouldn't be a need to put this on the meeting agenda. I'd give it another day tho before landing.

@mscdex
Copy link
Contributor

mscdex commented Jan 21, 2016

Out of curiosity, why is there an explicit list of characteristics anyway, especially if it could just go on and on forever like this since it's possible for anyone to discriminate for any reason? Isn't "we are committed to providing a friendly, safe and welcoming environment for all" enough?

@ChALkeR
Copy link
Member

ChALkeR commented Jan 21, 2016

LGTM

@benjamingr
Copy link
Member

@mscdex well presumably, if someone feels excluded from participating because of one of those traits from the list - they might feel better if they know they are explicitly encouraged to participate.

Or something like that.

@varjmes
Copy link

varjmes commented Jan 21, 2016

if someone feels excluded from participating because of one of those traits from the list - they might feel better if they know they are explicitly encouraged to participate.

This is largely why I proposed this in the first place, yeah 😄

@Qard
Copy link
Member

Qard commented Jan 21, 2016

@mscdex Explicit is better than implicit. One might try to argue that the lack of inclusion of a particular form of bigotry in the list is validation that it's "okay" when it really is not.

@Fishrock123
Copy link
Contributor

Updates still LGTM

@juliepagano
Copy link
Contributor

:lgtm: ✨

@ashleygwilliams
Copy link
Contributor

hey @jasnell do we think we'll merge today or next week? just curious.

really proud of our community's response on this thread. go node ❤️ 😊

@Fishrock123
Copy link
Contributor

@ashleygwilliams I don't see why we wouldn't merge it today. Since @zkat is a collaborator we defer to her to do the actual merge unless otherwise noted. :)

rust-lang/prev.rust-lang.org#288 landed in the Rust repo
so it seems like a good idea to just bring the updated list in.

We also received a request to do this in nodejs/inclusivity#82
so this should resolve that.

Thanks to [@Charlotteis](https://github.com/Charlotteis) for bringing
up the original issue.

Reviewed-By: Jeremiah Senkpiel <[email protected]>
Reviewed-By: Myles Borins <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Сковорода Никита Андреевич <[email protected]>
PR-URL: nodejs#4801
Fixes: nodejs/inclusivity#82
zkat added a commit that referenced this pull request Jan 22, 2016
rust-lang/prev.rust-lang.org#288 landed in the Rust repo
so it seems like a good idea to just bring the updated list in.

We also received a request to do this in nodejs/inclusivity#82
so this should resolve that.

Thanks to [@Charlotteis](https://github.com/Charlotteis) for bringing
up the original issue.

Reviewed-By: Jeremiah Senkpiel <[email protected]>
Reviewed-By: Myles Borins <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Сковорода Никита Андреевич <[email protected]>
PR-URL: #4801
Fixes: nodejs/inclusivity#82
@zkat
Copy link
Contributor Author

zkat commented Jan 22, 2016

Landed in master as of de0d35f 🎉

@ashleygwilliams
Copy link
Contributor

💖

@msikma
Copy link

msikma commented Jan 22, 2016

👍

@chriseppstein
Copy link

Suggestion: Change religion to religion or lack thereof.

@zkat
Copy link
Contributor Author

zkat commented Jan 22, 2016

@chriseppstein patches welcome 😁

@nebrius
Copy link
Contributor

nebrius commented Jan 22, 2016

FWIW, we just added that language to the inclusivity CoC: nodejs/inclusivity#97. Thanks for the suggestion @chriseppstein!

@jasnell
Copy link
Member

jasnell commented Jan 22, 2016

Closing because it landed :-) We'll definitely get this pulled back into the LTS... hopefully in the next round

@jasnell jasnell closed this Jan 22, 2016
environment for all, regardless of level of experience, gender
identity and expression, sexual orientation, disability,
personal appearance, body size, race, ethnicity, age, religion,
nationality, or other similar characteristic.
Copy link
Contributor

Choose a reason for hiding this comment

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

Would or any other characteristic have been better?

@bnoordhuis
Copy link
Member

@zkat Can you keep lines in the commit log <= 72 columns next time? Thanks.

rvagg pushed a commit that referenced this pull request Jan 25, 2016
rust-lang/prev.rust-lang.org#288 landed in the Rust repo
so it seems like a good idea to just bring the updated list in.

We also received a request to do this in nodejs/inclusivity#82
so this should resolve that.

Thanks to [@Charlotteis](https://github.com/Charlotteis) for bringing
up the original issue.

Reviewed-By: Jeremiah Senkpiel <[email protected]>
Reviewed-By: Myles Borins <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Сковорода Никита Андреевич <[email protected]>
PR-URL: #4801
Fixes: nodejs/inclusivity#82
MylesBorins pushed a commit that referenced this pull request Jan 28, 2016
rust-lang/prev.rust-lang.org#288 landed in the Rust repo
so it seems like a good idea to just bring the updated list in.

We also received a request to do this in nodejs/inclusivity#82
so this should resolve that.

Thanks to [@Charlotteis](https://github.com/Charlotteis) for bringing
up the original issue.

Reviewed-By: Jeremiah Senkpiel <[email protected]>
Reviewed-By: Myles Borins <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Сковорода Никита Андреевич <[email protected]>
PR-URL: #4801
Fixes: nodejs/inclusivity#82
MylesBorins pushed a commit that referenced this pull request Feb 11, 2016
rust-lang/prev.rust-lang.org#288 landed in the Rust repo
so it seems like a good idea to just bring the updated list in.

We also received a request to do this in nodejs/inclusivity#82
so this should resolve that.

Thanks to [@Charlotteis](https://github.com/Charlotteis) for bringing
up the original issue.

Reviewed-By: Jeremiah Senkpiel <[email protected]>
Reviewed-By: Myles Borins <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Сковорода Никита Андреевич <[email protected]>
PR-URL: #4801
Fixes: nodejs/inclusivity#82
MylesBorins pushed a commit to MylesBorins/node that referenced this pull request Feb 11, 2016
rust-lang/prev.rust-lang.org#288 landed in the Rust repo
so it seems like a good idea to just bring the updated list in.

We also received a request to do this in nodejs/inclusivity#82
so this should resolve that.

Thanks to [@Charlotteis](https://github.com/Charlotteis) for bringing
up the original issue.

Reviewed-By: Jeremiah Senkpiel <[email protected]>
Reviewed-By: Myles Borins <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Сковорода Никита Андреевич <[email protected]>
PR-URL: nodejs#4801
Fixes: nodejs/inclusivity#82
@MylesBorins MylesBorins mentioned this pull request Feb 11, 2016
MylesBorins pushed a commit to MylesBorins/node that referenced this pull request Feb 13, 2016
rust-lang/prev.rust-lang.org#288 landed in the Rust repo
so it seems like a good idea to just bring the updated list in.

We also received a request to do this in nodejs/inclusivity#82
so this should resolve that.

Thanks to [@Charlotteis](https://github.com/Charlotteis) for bringing
up the original issue.

Reviewed-By: Jeremiah Senkpiel <[email protected]>
Reviewed-By: Myles Borins <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Сковорода Никита Андреевич <[email protected]>
PR-URL: nodejs#4801
Fixes: nodejs/inclusivity#82
MylesBorins pushed a commit to MylesBorins/node that referenced this pull request Feb 15, 2016
rust-lang/prev.rust-lang.org#288 landed in the Rust repo
so it seems like a good idea to just bring the updated list in.

We also received a request to do this in nodejs/inclusivity#82
so this should resolve that.

Thanks to [@Charlotteis](https://github.com/Charlotteis) for bringing
up the original issue.

Reviewed-By: Jeremiah Senkpiel <[email protected]>
Reviewed-By: Myles Borins <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Сковорода Никита Андреевич <[email protected]>
PR-URL: nodejs#4801
Fixes: nodejs/inclusivity#82
scovetta pushed a commit to scovetta/node that referenced this pull request Apr 2, 2016
rust-lang/prev.rust-lang.org#288 landed in the Rust repo
so it seems like a good idea to just bring the updated list in.

We also received a request to do this in nodejs/inclusivity#82
so this should resolve that.

Thanks to [@Charlotteis](https://github.com/Charlotteis) for bringing
up the original issue.

Reviewed-By: Jeremiah Senkpiel <[email protected]>
Reviewed-By: Myles Borins <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Сковорода Никита Андреевич <[email protected]>
PR-URL: nodejs#4801
Fixes: nodejs/inclusivity#82
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
doc Issues and PRs related to the documentations. meta Issues and PRs related to the general management of the project.
Projects
None yet
Development

Successfully merging this pull request may close these issues.