From ce5da08beb0cf3a190f0608c0fd0fcaf6dd776f8 Mon Sep 17 00:00:00 2001 From: Mikeal Rogers Date: Fri, 14 Nov 2014 15:16:39 +0900 Subject: [PATCH 1/4] Governance, Contribution Policy, and Code of Conduct. --- conduct.md | 31 +++++++++++++++++++++++++++++ contribution-policy.md | 21 ++++++++++++++++++++ governance.md | 45 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 97 insertions(+) create mode 100644 conduct.md create mode 100644 contribution-policy.md create mode 100644 governance.md diff --git a/conduct.md b/conduct.md new file mode 100644 index 0000000..a691990 --- /dev/null +++ b/conduct.md @@ -0,0 +1,31 @@ +## Code of Conduct + +This Code of Conduct is adapted from [Rust's wonderful CoC](https://github.com/rust-lang/rust/wiki/Note-development-policy#conduct). + +* We are committed to providing a friendly, safe and welcoming environment for +all, regardless of gender, sexual orientation, disability, ethnicity, religion, +or similar personal characteristic. +* Please avoid using overtly sexual nicknames or other nicknames that might +detract from a friendly, safe and welcoming environment for all. +* Please be kind and courteous. There's no need to be mean or rude. +* Respect that people have differences of opinion and that every design or +implementation choice carries a trade-off and numerous costs. There is seldom +a right answer. +* Please keep unstructured critique to a minimum. If you have solid ideas you +want to experiment with, make a fork and see how it works. +* We will exclude you from interaction if you insult, demean or harass anyone. +That is not welcome behaviour. We interpret the term "harassment" as including +the definition in the [Citizen Code of Conduct](http://citizencodeofconduct.org/); +if you have any lack of clarity about what might be included in that concept, +please read their definition. In particular, we don't tolerate behavior that +excludes people in socially marginalized groups. +* Private harassment is also unacceptable. No matter who you are, if you feel +you have been or are being harassed or made uncomfortable by a community +member, please contact one of the channel ops or any of the TC members +immediately with a capture (log, photo, email) of the harassment if possible. +Whether you're a regular contributor or a newcomer, we care about making this +community a safe place for you and we've got your back. +* Likewise any spamming, trolling, flaming, baiting or other attention-stealing +behaviour is not welcome. +* Avoid the use of personal pronouns in code comments or documentation. There +is no need to address persons when explaining code (e.g. "When the developer") diff --git a/contribution-policy.md b/contribution-policy.md new file mode 100644 index 0000000..b32b1e4 --- /dev/null +++ b/contribution-policy.md @@ -0,0 +1,21 @@ +## Contribution Policy + +Individuals making significant and valuable contributions are given +commit-access to the project. These individuals are identified by the TC and +discussed during the weekly TC meeting. + +If you make a significant contribution and are not considered for commit-access +log an issue and it will be brought up in the next TC meeting. + +Internal pull-requests to solicit feedback are required for any other +non-trivial contribution but left to the discretion of the contributor. + +For significant changes wait a full 48 hours (72 hours if it spans a weekend) +before merging so that active contributors who are distributed throughout the +world have a chance to weigh in. + +Controversial changes and **very** significant changes should not be merged +until they have been discussed by the TC which will make any final decisions. + +TC members nominate contributors to be added to the TC which the TC will vote +on. They can nominate any individual during any meeting. diff --git a/governance.md b/governance.md new file mode 100644 index 0000000..d102cea --- /dev/null +++ b/governance.md @@ -0,0 +1,45 @@ +# Governance + +This repository is jointly governed by a technical +committee, commonly referred to as the "TC." + +Initial membership invitations to the TC were given to individuals who had +been active contributors to Node. Current membership is: + +``` +Fedor Indutny (@indutny) +Trevor Norris (@trevnorris) +Ben Noordhuis (@bnoordhuis) +Isaac Z. Schlueter (@isaacs) +Nathan Rajlich (@TooTallNate) +Bert Belder (@piscisaureus) +TJ Fontaine (@tjfontaine) +Alexis Campailla (@orangemocha) +``` + +Additionally the TC may invite persons or representatives from certain projects +to participate in a non-voting capacity. These invitees currently are: + +* A representative from [build](https://github.com/node-forward/build) chosen +by that project. + +The TC has final authority over this project including: + +* Project governance and process +* Contribution policy +* GitHub repository hosting + +The TC can change its governance model if they deem it necessary. The current +governance rules are: + +* [Consensus Seeking](http://en.wikipedia.org/wiki/Consensus-seeking_decision-making) +* Motions with voting when consensus cannot be reached. +* Quorum of 2/3 (66%), simple definite majority wins. +* No more than 1/3 (34%) of the TC membership can be affiliated with the same +employer. + +## TC Meetings + +The TC meets weekly on a Google hangout. The meeting is run by a designated +moderator, currently `Mikeal Rogers (@mikeal)`. Each meeting should be +published to Youtube. From 91268eac9d44d2edbf8b11c2f0bab3d4cda222bd Mon Sep 17 00:00:00 2001 From: isaacs Date: Fri, 14 Nov 2014 14:01:38 -0800 Subject: [PATCH 2/4] conduct: add nationality and language to protected characteristics Via: @k1tm https://github.com/joyent/nodejs-advisory-board/pull/11#issuecomment-63083056 Original PR-URL: https://github.com/joyent/nodejs-advisory-board/pull/11 --- conduct.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conduct.md b/conduct.md index a691990..e9e43b3 100644 --- a/conduct.md +++ b/conduct.md @@ -4,7 +4,7 @@ This Code of Conduct is adapted from [Rust's wonderful CoC](https://github.com/r * We are committed to providing a friendly, safe and welcoming environment for all, regardless of gender, sexual orientation, disability, ethnicity, religion, -or similar personal characteristic. +nationality, language ability, or similar personal characteristic. * Please avoid using overtly sexual nicknames or other nicknames that might detract from a friendly, safe and welcoming environment for all. * Please be kind and courteous. There's no need to be mean or rude. From 735a92f145ed1a9d569e57cd7b1ad88841dc7236 Mon Sep 17 00:00:00 2001 From: Mikeal Rogers Date: Sat, 15 Nov 2014 11:57:08 +0900 Subject: [PATCH 3/4] Adding website and releases to authority. --- governance.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/governance.md b/governance.md index d102cea..4356ff1 100644 --- a/governance.md +++ b/governance.md @@ -28,6 +28,8 @@ The TC has final authority over this project including: * Project governance and process * Contribution policy * GitHub repository hosting +* nodejs.org website +* Releases and Release process The TC can change its governance model if they deem it necessary. The current governance rules are: From bca286f5275ef15dc514fa4f8c074ed417bf4acb Mon Sep 17 00:00:00 2001 From: Mikeal Rogers Date: Sun, 16 Nov 2014 07:16:00 +0900 Subject: [PATCH 4/4] Removing governance and contribution policy, they are in #13 now. --- contribution-policy.md | 21 -------------------- governance.md | 45 ------------------------------------------ 2 files changed, 66 deletions(-) delete mode 100644 contribution-policy.md delete mode 100644 governance.md diff --git a/contribution-policy.md b/contribution-policy.md deleted file mode 100644 index b32b1e4..0000000 --- a/contribution-policy.md +++ /dev/null @@ -1,21 +0,0 @@ -## Contribution Policy - -Individuals making significant and valuable contributions are given -commit-access to the project. These individuals are identified by the TC and -discussed during the weekly TC meeting. - -If you make a significant contribution and are not considered for commit-access -log an issue and it will be brought up in the next TC meeting. - -Internal pull-requests to solicit feedback are required for any other -non-trivial contribution but left to the discretion of the contributor. - -For significant changes wait a full 48 hours (72 hours if it spans a weekend) -before merging so that active contributors who are distributed throughout the -world have a chance to weigh in. - -Controversial changes and **very** significant changes should not be merged -until they have been discussed by the TC which will make any final decisions. - -TC members nominate contributors to be added to the TC which the TC will vote -on. They can nominate any individual during any meeting. diff --git a/governance.md b/governance.md deleted file mode 100644 index d102cea..0000000 --- a/governance.md +++ /dev/null @@ -1,45 +0,0 @@ -# Governance - -This repository is jointly governed by a technical -committee, commonly referred to as the "TC." - -Initial membership invitations to the TC were given to individuals who had -been active contributors to Node. Current membership is: - -``` -Fedor Indutny (@indutny) -Trevor Norris (@trevnorris) -Ben Noordhuis (@bnoordhuis) -Isaac Z. Schlueter (@isaacs) -Nathan Rajlich (@TooTallNate) -Bert Belder (@piscisaureus) -TJ Fontaine (@tjfontaine) -Alexis Campailla (@orangemocha) -``` - -Additionally the TC may invite persons or representatives from certain projects -to participate in a non-voting capacity. These invitees currently are: - -* A representative from [build](https://github.com/node-forward/build) chosen -by that project. - -The TC has final authority over this project including: - -* Project governance and process -* Contribution policy -* GitHub repository hosting - -The TC can change its governance model if they deem it necessary. The current -governance rules are: - -* [Consensus Seeking](http://en.wikipedia.org/wiki/Consensus-seeking_decision-making) -* Motions with voting when consensus cannot be reached. -* Quorum of 2/3 (66%), simple definite majority wins. -* No more than 1/3 (34%) of the TC membership can be affiliated with the same -employer. - -## TC Meetings - -The TC meets weekly on a Google hangout. The meeting is run by a designated -moderator, currently `Mikeal Rogers (@mikeal)`. Each meeting should be -published to Youtube.