Update the Code of Conduct to the latest version #4402

Merged
merged 1 commit into from Jan 26, 2016

Conversation

Projects
None yet
5 participants
@davidcelis
Contributor

davidcelis commented Jan 26, 2016

The Contributor Code of Conduct is now at version 1.3.0 and has several
changes. Many of these are simply wording changes, but an important note
is added that project maintainers must maintain confidentiality when
dealing with any code of conduct violations. Additionally, a note is
added that states violations will be investigated and dealt with in a
way that is deemed necessary and appropriate based on the circumstances.

Signed-off-by: David Celis me@davidcel.is

Update the Code of Conduct to the latest version
The Contributor Code of Conduct is now at version 1.3.0 and has several
changes. Many of these are simply wording changes, but an important note
is added that project maintainers must maintain confidentiality when
dealing with any code of conduct violations. Additionally, a note is
added that states violations will be investigated and dealt with in a
way that is deemed necessary and appropriate based on the circumstances.

Signed-off-by: David Celis <me@davidcel.is>
@davidcelis

This comment has been minimized.

Show comment
Hide comment
@davidcelis

davidcelis Jan 26, 2016

Contributor

Quick note: version 1.3 also asks that project maintainers supply an email address that people can use to contact about issues due to GitHub Issues being harder to use confidentially. Is there an email address that people can use to contact the Jekyll team?

P.S: Thank you so much for adding this Code of Conduct to Jekyll in the first place!

Contributor

davidcelis commented Jan 26, 2016

Quick note: version 1.3 also asks that project maintainers supply an email address that people can use to contact about issues due to GitHub Issues being harder to use confidentially. Is there an email address that people can use to contact the Jekyll team?

P.S: Thank you so much for adding this Code of Conduct to Jekyll in the first place!

@envygeeks

This comment has been minimized.

Show comment
Hide comment
@envygeeks

envygeeks Jan 26, 2016

Contributor

We adopted the Rails CoC which is less hostile, I feel like the wording of your CoC is very hostile.

Contributor

envygeeks commented Jan 26, 2016

We adopted the Rails CoC which is less hostile, I feel like the wording of your CoC is very hostile.

@davidcelis

This comment has been minimized.

Show comment
Hide comment
@davidcelis

davidcelis Jan 26, 2016

Contributor

The Code of Conduct currently in Jekyll is version 1.2.0 of the same code of conduct, so this is just an update. The current code of conduct is even linked with attribution at the bottom to the Contributor Covenant.

What are the parts you feel are more hostile? I don't see anything in the diff that's not in the way of a couple minor wording tweaks and the additional clauses that mention confidentiality and that incidents are actually investigated and dealt with. To me, the tone feels basically the same. Could you help me understand your concerns with more specifics?

Also, if you feel like it's more hostile, then perhaps it's worth discussion at the Contributor Covenant's repository? Coraline has, in my experience, been very opening to changing the wording of her CoC as long as the spirit of it is not lost.

Contributor

davidcelis commented Jan 26, 2016

The Code of Conduct currently in Jekyll is version 1.2.0 of the same code of conduct, so this is just an update. The current code of conduct is even linked with attribution at the bottom to the Contributor Covenant.

What are the parts you feel are more hostile? I don't see anything in the diff that's not in the way of a couple minor wording tweaks and the additional clauses that mention confidentiality and that incidents are actually investigated and dealt with. To me, the tone feels basically the same. Could you help me understand your concerns with more specifics?

Also, if you feel like it's more hostile, then perhaps it's worth discussion at the Contributor Covenant's repository? Coraline has, in my experience, been very opening to changing the wording of her CoC as long as the spirit of it is not lost.

@phedinkus

This comment has been minimized.

Show comment
Hide comment
@phedinkus

phedinkus Jan 26, 2016

@envygeeks I don't get your comment. The change is minimal. What lines are the problem? Can you speak to them directly?

@envygeeks I don't get your comment. The change is minimal. What lines are the problem? Can you speak to them directly?

@stephencelis

This comment has been minimized.

Show comment
Hide comment
@stephencelis

stephencelis Jan 26, 2016

Maybe it was more difficult to scan the diff with the whitespace changes, but the vast majority of the wording is identical and I don't really see any difference that appears "hostile." (If anything, it appears to be a bit more forgiving but specific?)

While Rails is still on v1.2.0 of the Contributor Covenant, I imagine they'll updated it when given a nudge (and/or a PR to https://github.com/rails/homepage). Swift, meanwhile, has already updated: https://swift.org/community/#code-of-conduct

Maybe it was more difficult to scan the diff with the whitespace changes, but the vast majority of the wording is identical and I don't really see any difference that appears "hostile." (If anything, it appears to be a bit more forgiving but specific?)

While Rails is still on v1.2.0 of the Contributor Covenant, I imagine they'll updated it when given a nudge (and/or a PR to https://github.com/rails/homepage). Swift, meanwhile, has already updated: https://swift.org/community/#code-of-conduct

@envygeeks

This comment has been minimized.

Show comment
Hide comment
@envygeeks

envygeeks Jan 26, 2016

Contributor

I was simply reading a word wrong. I re-read it this morning and I am fine.

Contributor

envygeeks commented Jan 26, 2016

I was simply reading a word wrong. I re-read it this morning and I am fine.

envygeeks added a commit that referenced this pull request Jan 26, 2016

Merge pull request #4402 from davidcelis/update-code-of-conduct
Update the Code of Conduct to the latest version

@envygeeks envygeeks merged commit a13102f into jekyll:master Jan 26, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
@stephencelis

This comment has been minimized.

Show comment
Hide comment

👍

@davidcelis

This comment has been minimized.

Show comment
Hide comment
@davidcelis

davidcelis Jan 26, 2016

Contributor

Thank you!

Contributor

davidcelis commented Jan 26, 2016

Thank you!

@jekyll jekyll locked and limited conversation to collaborators Feb 27, 2017

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.