From de67a3e95ef4b7405fb10271dfbaed7e556a49c2 Mon Sep 17 00:00:00 2001 From: Manil Chowdhury Date: Tue, 23 Jul 2019 11:19:08 -0700 Subject: [PATCH 01/30] Add process for handling reports Reports made to report@openjsf.org will follow this process once ratified. --- HANDLING-REPORTS.md | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 HANDLING-REPORTS.md diff --git a/HANDLING-REPORTS.md b/HANDLING-REPORTS.md new file mode 100644 index 000000000..a87b666e7 --- /dev/null +++ b/HANDLING-REPORTS.md @@ -0,0 +1,37 @@ +# Handling reports and escalation +This document describes the proposed process for handling reports and escalation, along with relevant roles in the OpenJS Foundation. + +Reporting to the OpenJS Foundation either concerns a matter with the Foundation or is considered an escalation where insufficient resolution was provided by a project. + +## Channels +* Email: report@openjsf.org + * This email address is for aliasing (like tsc@nodejs.org) to roles in handling reports and escalation. + * We can use groups.io +* Form: It would be easier on the reportee to have a form template to help them structure their report. The form submission could trigger an email +* Repo: openjs/moderation (not provisioned) + * A form submission could open an issue in the repo, to allow folks to discuss in context +## Confidentiality and record-keeping +Everything reported and discussed is confidential unless explicitly stated. For any facts to be made public, the reportee’s explicit permission is needed. All reports should be recorded, together with the discussion of it. A private moderation repo would satisfy the need for recordkeeping. +## Steps/Escalation +1. A report is filed: This is the first step, mostly defined in Channels above. +2. The right people are alerted: See Roles. +3. Contact person assigned: See Roles. +4. Report is acknowledged: The contact person responds to let the reportee know that the report is being discussed. +5. Facts are gathered: Time is allocated to collect information in one place to make sure everyone involved has access. +6. Facts are discussed: The facts are discussed in context. Also see What to look forward to for guidelines on appropriate response. +7. An action to be taken is arrived at: The action to be taken is decided by consensus. +8. Resolution offered: The resolution is offered to the reportee by the contact person. The reportee needs to accept the resolution for the matter to be resolved. If they don’t accept, go back to step 5. If there isn't a clear way to resolve the report, the report can be reviewed by the moderation team representatives from OpenJS projects to ensure that the the action and resolution are appropriate. +The report is resolved: The report is resolved when the reportee accepts the action. +## Roles +* Moderation team representatives: Each project in the CPC which has a moderation team should have representation here. https://github.com/openjs-foundation can ask these folks if any are willing to also moderate this org. +* Ombudsperson: This person acts as an impartial intermediary between a reporter and the Foundation. They also serve to mediate between the moderation team representatives. +* Contact person: This is a sensitive matter. Each reportee should only have to become comfortable talking with 1 person who represents them to the representatives. +## Further questions +* How do we protect privacy? +* How do we investigate? +* What are the conflicts of interest? +* How to avoid conflicts of interest? +* Does this relate to the work of the Node.js and other projects’ moderation team? +## What to look forward to +* Beacon project +* Code of Conduct Project: A cross-project collaboration between multiple open source tech communities RxJS, AngularJS, Node.js, Vue.js etc to find consensus on Code of Conducts. Progress is rapid and can add definition to our own process (where possible) within 6 months. Recommend incorporating the findings and avoid duplication of effort. From 3a41881288403c54e868ddafb4e053edd1598ed9 Mon Sep 17 00:00:00 2001 From: Manil Chowdhury Date: Tue, 30 Jul 2019 11:09:28 -0700 Subject: [PATCH 02/30] Combine report handling with S1 CoC proposal --- .../stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename HANDLING-REPORTS.md => proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md (100%) diff --git a/HANDLING-REPORTS.md b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md similarity index 100% rename from HANDLING-REPORTS.md rename to proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md From 0fe421d889e85209e68af0bce3f3e57511d174af Mon Sep 17 00:00:00 2001 From: Manil Chowdhury Date: Tue, 30 Jul 2019 11:14:44 -0700 Subject: [PATCH 03/30] Address comment: specify subject of reports --- proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md index a87b666e7..2d39af228 100644 --- a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md +++ b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md @@ -1,7 +1,7 @@ # Handling reports and escalation This document describes the proposed process for handling reports and escalation, along with relevant roles in the OpenJS Foundation. -Reporting to the OpenJS Foundation either concerns a matter with the Foundation or is considered an escalation where insufficient resolution was provided by a project. +Reporting to the OpenJS Foundation either concerns a matter with the Foundation or is considered an escalation where insufficient resolution was provided by a project, with regards to violations of the Code of Conduct. ## Channels * Email: report@openjsf.org From fbbf76341d6a9ecf3308b245a67ecd2f1ddcbaae Mon Sep 17 00:00:00 2001 From: Manil Chowdhury Date: Tue, 30 Jul 2019 11:20:21 -0700 Subject: [PATCH 04/30] Add need to review personal info storage on Github --- proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md index 2d39af228..7f60e20cb 100644 --- a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md +++ b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md @@ -4,12 +4,10 @@ This document describes the proposed process for handling reports and escalation Reporting to the OpenJS Foundation either concerns a matter with the Foundation or is considered an escalation where insufficient resolution was provided by a project, with regards to violations of the Code of Conduct. ## Channels -* Email: report@openjsf.org - * This email address is for aliasing (like tsc@nodejs.org) to roles in handling reports and escalation. - * We can use groups.io -* Form: It would be easier on the reportee to have a form template to help them structure their report. The form submission could trigger an email -* Repo: openjs/moderation (not provisioned) - * A form submission could open an issue in the repo, to allow folks to discuss in context +* Email: report@openjsf.org. +* Form: It would be easier on the reportee to have a form template to help them structure their report. The form submission could trigger an email. +* Repo: openjs/moderation (not provisioned). As commented in PR review, hosting sensitive personal information on GitHub needs due consideration, review, and possibly legal consultation. + * A form submission could open an issue in the repo, to allow folks to discuss in context. ## Confidentiality and record-keeping Everything reported and discussed is confidential unless explicitly stated. For any facts to be made public, the reportee’s explicit permission is needed. All reports should be recorded, together with the discussion of it. A private moderation repo would satisfy the need for recordkeeping. ## Steps/Escalation From e3bf6ef6ec2d29704e3a4bc6489c41bd6b1a09f5 Mon Sep 17 00:00:00 2001 From: Manil Chowdhury Date: Tue, 30 Jul 2019 11:24:54 -0700 Subject: [PATCH 05/30] Address comment: explicitly list collecting opinions --- proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md index 7f60e20cb..489d1b9dd 100644 --- a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md +++ b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md @@ -15,8 +15,8 @@ Everything reported and discussed is confidential unless explicitly stated. For 2. The right people are alerted: See Roles. 3. Contact person assigned: See Roles. 4. Report is acknowledged: The contact person responds to let the reportee know that the report is being discussed. -5. Facts are gathered: Time is allocated to collect information in one place to make sure everyone involved has access. -6. Facts are discussed: The facts are discussed in context. Also see What to look forward to for guidelines on appropriate response. +5. Facts and opinions are gathered: Time is allocated to collect information in one place to make sure everyone involved has access. +6. Facts are discussed: The facts are discussed in context of opinions. Also see **What to look forward to** for guidelines on appropriate response. 7. An action to be taken is arrived at: The action to be taken is decided by consensus. 8. Resolution offered: The resolution is offered to the reportee by the contact person. The reportee needs to accept the resolution for the matter to be resolved. If they don’t accept, go back to step 5. If there isn't a clear way to resolve the report, the report can be reviewed by the moderation team representatives from OpenJS projects to ensure that the the action and resolution are appropriate. The report is resolved: The report is resolved when the reportee accepts the action. From dac1d84bd2117b18db832ef13629f474f792b367 Mon Sep 17 00:00:00 2001 From: Manil Chowdhury Date: Tue, 30 Jul 2019 11:34:52 -0700 Subject: [PATCH 06/30] Address comment: allow for issues to be closed in certain conditions --- proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md index 489d1b9dd..9785c450a 100644 --- a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md +++ b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md @@ -17,13 +17,18 @@ Everything reported and discussed is confidential unless explicitly stated. For 4. Report is acknowledged: The contact person responds to let the reportee know that the report is being discussed. 5. Facts and opinions are gathered: Time is allocated to collect information in one place to make sure everyone involved has access. 6. Facts are discussed: The facts are discussed in context of opinions. Also see **What to look forward to** for guidelines on appropriate response. -7. An action to be taken is arrived at: The action to be taken is decided by consensus. +7. An action to be taken is arrived at: The action to be taken is decided by consensus (see section on Consensus process) involving the roles listed in the next section. 8. Resolution offered: The resolution is offered to the reportee by the contact person. The reportee needs to accept the resolution for the matter to be resolved. If they don’t accept, go back to step 5. If there isn't a clear way to resolve the report, the report can be reviewed by the moderation team representatives from OpenJS projects to ensure that the the action and resolution are appropriate. -The report is resolved: The report is resolved when the reportee accepts the action. +The report is resolved: The report is resolved if: +* the reportee accepts the action. +* there is no communication for 21 days on behalf of the original reporter. +* the Ombudsperson decides that the resolution as it stands is the best possible outcome within the constraints of all involved. ## Roles * Moderation team representatives: Each project in the CPC which has a moderation team should have representation here. https://github.com/openjs-foundation can ask these folks if any are willing to also moderate this org. * Ombudsperson: This person acts as an impartial intermediary between a reporter and the Foundation. They also serve to mediate between the moderation team representatives. * Contact person: This is a sensitive matter. Each reportee should only have to become comfortable talking with 1 person who represents them to the representatives. +## Concensus process +_To be added after deliberation in CPC._ ## Further questions * How do we protect privacy? * How do we investigate? From b9b213136abd7e510c36c42ff7eb5970c62eb956 Mon Sep 17 00:00:00 2001 From: Manil Chowdhury Date: Wed, 7 Aug 2019 13:40:15 -0700 Subject: [PATCH 07/30] Add CPC as role --- proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md index 9785c450a..21af7b860 100644 --- a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md +++ b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md @@ -24,6 +24,7 @@ The report is resolved: The report is resolved if: * there is no communication for 21 days on behalf of the original reporter. * the Ombudsperson decides that the resolution as it stands is the best possible outcome within the constraints of all involved. ## Roles +* CPC: The Cross Project Council must get involved in cases where a report has been escalated by a project or its team reponsible for enforcing their Code of Conduct. * Moderation team representatives: Each project in the CPC which has a moderation team should have representation here. https://github.com/openjs-foundation can ask these folks if any are willing to also moderate this org. * Ombudsperson: This person acts as an impartial intermediary between a reporter and the Foundation. They also serve to mediate between the moderation team representatives. * Contact person: This is a sensitive matter. Each reportee should only have to become comfortable talking with 1 person who represents them to the representatives. From 25d3fd263dcd870e729465314720d7e759188639 Mon Sep 17 00:00:00 2001 From: Manil Chowdhury Date: Wed, 7 Aug 2019 13:43:48 -0700 Subject: [PATCH 08/30] Add TBD: role of members --- proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md index 21af7b860..766142ed6 100644 --- a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md +++ b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md @@ -24,7 +24,7 @@ The report is resolved: The report is resolved if: * there is no communication for 21 days on behalf of the original reporter. * the Ombudsperson decides that the resolution as it stands is the best possible outcome within the constraints of all involved. ## Roles -* CPC: The Cross Project Council must get involved in cases where a report has been escalated by a project or its team reponsible for enforcing their Code of Conduct. +* CPC: The Cross Project Council must get involved in cases where a report has been escalated by a project or its team reponsible for enforcing their Code of Conduct. (TBD: role of regular and voting members) * Moderation team representatives: Each project in the CPC which has a moderation team should have representation here. https://github.com/openjs-foundation can ask these folks if any are willing to also moderate this org. * Ombudsperson: This person acts as an impartial intermediary between a reporter and the Foundation. They also serve to mediate between the moderation team representatives. * Contact person: This is a sensitive matter. Each reportee should only have to become comfortable talking with 1 person who represents them to the representatives. From e9968309af524691105cbf9aa9e38f97a729b5f3 Mon Sep 17 00:00:00 2001 From: Manil Chowdhury Date: Tue, 3 Sep 2019 11:12:18 -0700 Subject: [PATCH 09/30] Apply suggestions from review Co-Authored-By: Myles Borins Co-Authored-By: Sendil Kumar N --- proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md index 766142ed6..5a5873a35 100644 --- a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md +++ b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md @@ -5,7 +5,7 @@ Reporting to the OpenJS Foundation either concerns a matter with the Foundation ## Channels * Email: report@openjsf.org. -* Form: It would be easier on the reportee to have a form template to help them structure their report. The form submission could trigger an email. +* Form: You can anonymously report via our [online form](TBD) * Repo: openjs/moderation (not provisioned). As commented in PR review, hosting sensitive personal information on GitHub needs due consideration, review, and possibly legal consultation. * A form submission could open an issue in the repo, to allow folks to discuss in context. ## Confidentiality and record-keeping @@ -19,13 +19,14 @@ Everything reported and discussed is confidential unless explicitly stated. For 6. Facts are discussed: The facts are discussed in context of opinions. Also see **What to look forward to** for guidelines on appropriate response. 7. An action to be taken is arrived at: The action to be taken is decided by consensus (see section on Consensus process) involving the roles listed in the next section. 8. Resolution offered: The resolution is offered to the reportee by the contact person. The reportee needs to accept the resolution for the matter to be resolved. If they don’t accept, go back to step 5. If there isn't a clear way to resolve the report, the report can be reviewed by the moderation team representatives from OpenJS projects to ensure that the the action and resolution are appropriate. -The report is resolved: The report is resolved if: + +The report is resolved if: * the reportee accepts the action. * there is no communication for 21 days on behalf of the original reporter. * the Ombudsperson decides that the resolution as it stands is the best possible outcome within the constraints of all involved. ## Roles * CPC: The Cross Project Council must get involved in cases where a report has been escalated by a project or its team reponsible for enforcing their Code of Conduct. (TBD: role of regular and voting members) -* Moderation team representatives: Each project in the CPC which has a moderation team should have representation here. https://github.com/openjs-foundation can ask these folks if any are willing to also moderate this org. +* Moderation team representatives: Each project in the CPC which has a moderation team should have representation here. [OpenJS Foundation](https://github.com/openjs-foundation) can ask these folks if any are willing to also moderate this org. * Ombudsperson: This person acts as an impartial intermediary between a reporter and the Foundation. They also serve to mediate between the moderation team representatives. * Contact person: This is a sensitive matter. Each reportee should only have to become comfortable talking with 1 person who represents them to the representatives. ## Concensus process From 516f586d66aa87b5c9a3bb9c8df5ccf686cb6be2 Mon Sep 17 00:00:00 2001 From: Manil Chowdhury Date: Wed, 4 Sep 2019 21:44:32 -0700 Subject: [PATCH 10/30] Update placeholder email --- .../FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/proposals/stage-1/CODE_OF_CONDUCT/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md b/proposals/stage-1/CODE_OF_CONDUCT/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md index 2f9cea95a..02f8e3d6f 100644 --- a/proposals/stage-1/CODE_OF_CONDUCT/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md +++ b/proposals/stage-1/CODE_OF_CONDUCT/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md @@ -16,19 +16,19 @@ as its code of conduct and it applies to all foundation activities and spaces. I addition, projects joining the foundation are required to adopt this code of conduct within 3 months of joining the foundation. -The foundation has chosen to require a common Code of Conduct. This will allow a common +A common Code of Conduct will allow a common escalation process and will allow the Foundation to better support projects in their efforts to apply the Code of Conduct. ## Enforcement -For spaces managed by the foundation complaints can be forwarded to report@xxxx.org and will -be investigated by the Cross Project Council(CPC) or its delegates. All complaints will be reviewed, +For spaces managed by the Foundation, complaints can be forwarded to report@openjsf.org and will +be investigated by the Cross Project Council (CPC) or its delegates. All complaints will be reviewed, investigated, and will result in a response that is deemed necessary and appropriate to the circumstances. The CPC is obligated to maintain confidentiality with regard to the reporter of an incident. -For spaces managed by each project, the project must provide an email to which complaints +For spaces managed by member projects, the project must provide an email to which complaints can be forwarded and document that complaints will be investigated and will result in a response that is deemed appropriate for the circumstances. Each project is free to implement enforcement of the Code of Conduct using processes appropriate for the size From b3f81e874c9b95a861b0fe6fccf613159fd53237 Mon Sep 17 00:00:00 2001 From: Manil Chowdhury Date: Wed, 4 Sep 2019 21:45:32 -0700 Subject: [PATCH 11/30] Use suggestions * Insert links * Remove content * Use suggested language --- .../CODE_OF_CONDUCT/HANDLING-REPORTS.md | 32 +++++++------------ 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md index 5a5873a35..6adf5809b 100644 --- a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md +++ b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md @@ -4,20 +4,19 @@ This document describes the proposed process for handling reports and escalation Reporting to the OpenJS Foundation either concerns a matter with the Foundation or is considered an escalation where insufficient resolution was provided by a project, with regards to violations of the Code of Conduct. ## Channels -* Email: report@openjsf.org. -* Form: You can anonymously report via our [online form](TBD) -* Repo: openjs/moderation (not provisioned). As commented in PR review, hosting sensitive personal information on GitHub needs due consideration, review, and possibly legal consultation. - * A form submission could open an issue in the repo, to allow folks to discuss in context. +* Email: report@openjsf.org +* Form: It would be easier on the reportee to have a form template to help them structure their report. The form submission could trigger an email. +* Repo: Discussion of the reports happen in [private repo](TBD). ## Confidentiality and record-keeping Everything reported and discussed is confidential unless explicitly stated. For any facts to be made public, the reportee’s explicit permission is needed. All reports should be recorded, together with the discussion of it. A private moderation repo would satisfy the need for recordkeeping. ## Steps/Escalation -1. A report is filed: This is the first step, mostly defined in Channels above. -2. The right people are alerted: See Roles. -3. Contact person assigned: See Roles. +1. A report is filed: This is the first step, mostly defined in [Channels](#Channels) above. +2. On call staff are alerted: See [Roles](#Roles). +3. Contact person assigned: See [Roles](#Roles). 4. Report is acknowledged: The contact person responds to let the reportee know that the report is being discussed. -5. Facts and opinions are gathered: Time is allocated to collect information in one place to make sure everyone involved has access. -6. Facts are discussed: The facts are discussed in context of opinions. Also see **What to look forward to** for guidelines on appropriate response. -7. An action to be taken is arrived at: The action to be taken is decided by consensus (see section on Consensus process) involving the roles listed in the next section. +5. Information gathering: Time is allocated to collect information in one place to make sure everyone involved has access. +6. Information is discussed: The facts are discussed in context of opinions. Also see **What to look forward to** for guidelines on appropriate response. +7. An action to be taken is arrived at: The action to be taken is decided by consensus (see section on [Consensus process](#Consensus-process)) involving the roles listed in the next section. 8. Resolution offered: The resolution is offered to the reportee by the contact person. The reportee needs to accept the resolution for the matter to be resolved. If they don’t accept, go back to step 5. If there isn't a clear way to resolve the report, the report can be reviewed by the moderation team representatives from OpenJS projects to ensure that the the action and resolution are appropriate. The report is resolved if: @@ -29,14 +28,5 @@ The report is resolved if: * Moderation team representatives: Each project in the CPC which has a moderation team should have representation here. [OpenJS Foundation](https://github.com/openjs-foundation) can ask these folks if any are willing to also moderate this org. * Ombudsperson: This person acts as an impartial intermediary between a reporter and the Foundation. They also serve to mediate between the moderation team representatives. * Contact person: This is a sensitive matter. Each reportee should only have to become comfortable talking with 1 person who represents them to the representatives. -## Concensus process -_To be added after deliberation in CPC._ -## Further questions -* How do we protect privacy? -* How do we investigate? -* What are the conflicts of interest? -* How to avoid conflicts of interest? -* Does this relate to the work of the Node.js and other projects’ moderation team? -## What to look forward to -* Beacon project -* Code of Conduct Project: A cross-project collaboration between multiple open source tech communities RxJS, AngularJS, Node.js, Vue.js etc to find consensus on Code of Conducts. Progress is rapid and can add definition to our own process (where possible) within 6 months. Recommend incorporating the findings and avoid duplication of effort. +## Consensus process +_To be added after deliberation in CPC._ \ No newline at end of file From 16e4431224097f1d07f68b2665ad83e4854f67a1 Mon Sep 17 00:00:00 2001 From: Manil Chowdhury Date: Wed, 4 Sep 2019 22:06:05 -0700 Subject: [PATCH 12/30] Update README.md * Revise description and completion criteria * Add further questions --- proposals/stage-1/CODE_OF_CONDUCT/README.md | 25 ++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/proposals/stage-1/CODE_OF_CONDUCT/README.md b/proposals/stage-1/CODE_OF_CONDUCT/README.md index 1b651b5ab..f6d67a79f 100644 --- a/proposals/stage-1/CODE_OF_CONDUCT/README.md +++ b/proposals/stage-1/CODE_OF_CONDUCT/README.md @@ -7,8 +7,11 @@ Michael Dawson (@mhdawson) ## Description -This document captures a proposed approach for +These documents capture a proposed approach for implementing and handling Code of Conducts within the Foundation. + +* FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md: a proposed approach for managing Code of Conducts within the Foundation. +* HANDLING-REPORTS.md: a proposed framework for handling reports and escalation. ## Required Resources @@ -18,11 +21,11 @@ Discussion/approval by bootstrap committee In current proposals for the groups within a merged foundation, the responsibility would be a joint -responsibility of the Foundation, Board, CPC and projects. +responsibility of the Foundation, Board, CPC, and projects. ## How would success be measured? -Success is incorporate of the content within this document +Success is incorporation of the content within this document either as the document itself or incorporate into one of the other Governance documents for the foundation. @@ -34,4 +37,20 @@ foundation. ## What is neccessary to complete this proposal +* Aligned language within the documents of the proposal + +## Further questions + +* How do we protect privacy? +* How do we investigate? +* What are the conflicts of interest? +* How to avoid conflicts of interest? +* Does this relate to the work of the Node.js and other projects’ moderation team? + +### Implementation details for channels +* Form: It would be easier on the reportee to have a form template to help them structure their report. The form submission could trigger an email. TODO: copy for a form. +* Repo: openjs/moderation (not provisioned). As commented in PR review, hosting sensitive personal information on GitHub needs due consideration, review, and possibly legal consultation. +### What to look forward to +* Beacon project +* Code of Conduct Project: A cross-project collaboration between multiple open source tech communities RxJS, AngularJS, Node.js, Vue.js etc to find consensus on Code of Conducts. Progress is rapid and can add definition to our own process (where possible) within 6 months. Recommend incorporating the findings and avoid duplication of effort. \ No newline at end of file From 3e0d1a920764c9b7757a0df39f1e0a9eadc7262c Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Fri, 6 Sep 2019 13:51:04 -0400 Subject: [PATCH 13/30] Update proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md Co-Authored-By: Manil Chowdhury --- proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md index 6adf5809b..b10d7122b 100644 --- a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md +++ b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md @@ -8,7 +8,7 @@ Reporting to the OpenJS Foundation either concerns a matter with the Foundation * Form: It would be easier on the reportee to have a form template to help them structure their report. The form submission could trigger an email. * Repo: Discussion of the reports happen in [private repo](TBD). ## Confidentiality and record-keeping -Everything reported and discussed is confidential unless explicitly stated. For any facts to be made public, the reportee’s explicit permission is needed. All reports should be recorded, together with the discussion of it. A private moderation repo would satisfy the need for recordkeeping. +Personal information is confidential. All reports should be recorded, together with the discussion of it. A private moderation repo would satisfy the need for recordkeeping. ## Steps/Escalation 1. A report is filed: This is the first step, mostly defined in [Channels](#Channels) above. 2. On call staff are alerted: See [Roles](#Roles). @@ -29,4 +29,4 @@ The report is resolved if: * Ombudsperson: This person acts as an impartial intermediary between a reporter and the Foundation. They also serve to mediate between the moderation team representatives. * Contact person: This is a sensitive matter. Each reportee should only have to become comfortable talking with 1 person who represents them to the representatives. ## Consensus process -_To be added after deliberation in CPC._ \ No newline at end of file +_To be added after deliberation in CPC._ From f547434b00c02c132151824db59dd5f002057075 Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Fri, 6 Sep 2019 14:36:14 -0400 Subject: [PATCH 14/30] squash: align with rest of docs in proposal Align with text in FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md --- .../CODE_OF_CONDUCT/HANDLING-REPORTS.md | 106 +++++++++++++----- 1 file changed, 79 insertions(+), 27 deletions(-) diff --git a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md index b10d7122b..aadf674f8 100644 --- a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md +++ b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md @@ -1,32 +1,84 @@ # Handling reports and escalation This document describes the proposed process for handling reports and escalation, along with relevant roles in the OpenJS Foundation. -Reporting to the OpenJS Foundation either concerns a matter with the Foundation or is considered an escalation where insufficient resolution was provided by a project, with regards to violations of the Code of Conduct. +This process covers two types of reports based on ./FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md: + +* Reports for spaces managed by the Cross Project Council (CPC) which come in through `report@opensjsf.org` +* Escalations which come in through `coc-escalation@openjsf.org`. + +Generall, reports to coc-escalation should refer to a report that was already submitted to: + +* report@openjsf.org or +* one of the projects reporting emails +* explaination of why the reportee does not feel comfortable using the previous reporting emails for the initial report + +If a report to coc-esclation do not include one of those, the reportee will be asked to to provide one of those three as the +reason for reporting to coc-escalation. -## Channels -* Email: report@openjsf.org -* Form: It would be easier on the reportee to have a form template to help them structure their report. The form submission could trigger an email. -* Repo: Discussion of the reports happen in [private repo](TBD). ## Confidentiality and record-keeping -Personal information is confidential. All reports should be recorded, together with the discussion of it. A private moderation repo would satisfy the need for recordkeeping. -## Steps/Escalation -1. A report is filed: This is the first step, mostly defined in [Channels](#Channels) above. -2. On call staff are alerted: See [Roles](#Roles). -3. Contact person assigned: See [Roles](#Roles). -4. Report is acknowledged: The contact person responds to let the reportee know that the report is being discussed. -5. Information gathering: Time is allocated to collect information in one place to make sure everyone involved has access. -6. Information is discussed: The facts are discussed in context of opinions. Also see **What to look forward to** for guidelines on appropriate response. -7. An action to be taken is arrived at: The action to be taken is decided by consensus (see section on [Consensus process](#Consensus-process)) involving the roles listed in the next section. -8. Resolution offered: The resolution is offered to the reportee by the contact person. The reportee needs to accept the resolution for the matter to be resolved. If they don’t accept, go back to step 5. If there isn't a clear way to resolve the report, the report can be reviewed by the moderation team representatives from OpenJS projects to ensure that the the action and resolution are appropriate. - -The report is resolved if: -* the reportee accepts the action. -* there is no communication for 21 days on behalf of the original reporter. -* the Ombudsperson decides that the resolution as it stands is the best possible outcome within the constraints of all involved. -## Roles -* CPC: The Cross Project Council must get involved in cases where a report has been escalated by a project or its team reponsible for enforcing their Code of Conduct. (TBD: role of regular and voting members) -* Moderation team representatives: Each project in the CPC which has a moderation team should have representation here. [OpenJS Foundation](https://github.com/openjs-foundation) can ask these folks if any are willing to also moderate this org. -* Ombudsperson: This person acts as an impartial intermediary between a reporter and the Foundation. They also serve to mediate between the moderation team representatives. -* Contact person: This is a sensitive matter. Each reportee should only have to become comfortable talking with 1 person who represents them to the representatives. -## Consensus process -_To be added after deliberation in CPC._ +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. + +report@openjsf.org -> github.com/openjs-foundation/moderation +coc-escalation@openjsf.org -> github.com/openjs-foundation/coc-escalation + +For each report there should be an issue which captures the report, discussion and final conclusion. The report should NOT contain identifying details of the reporter. + +## Reports to report@openjsf.org + +All members of the CPC are subscribed to the `report@openjsf.org` mailing list. When a report is received the following actions will be taken: + * One of the CPC members will respond to the reportee confirming that the report has been received. When possible the same person + who responds initially will act as the point of contact for future conversations. + * If no respose has been send by the next CPC meeeting the CPC chair will ensure there is a private session in which the one of the + CPC members is identified as the point of contact. + * The point of contact will then ensure the following steps are completed: + 1. Report is acknowledged: The contact person responds to let the reportee know that the report is being discussed. + 2. Information gathering: Time is allocated to collect information in one place to make sure everyone involved has access. + 3. Information is discussed: The facts are discussed in context of opinions. This can be done in the issue for the report, or + in a meeting in which case the key discussion points should then be added to the issue. + 4. An action to be taken is arrived at: The action to be taken is decided by consensus as per the standard CPC + [Decision Making](https://github.com/openjs-foundation/cross-project-council/blob/master/CPC-CHARTER.md#section-9-decision-making) process. + 5. Resolution offered: The resolution is offered to the reportee by the contact person. If the resolution is accepted as + reasonable or there is no response the process moves to the next step. If the reportee expreses concerns then the + contact person will bring these back to the CPC members for further discussion. This cycle can continue until the + CPC members reach consensus that the reportee's concerns have been adquately addressed. + 6. Final resolution: the resolution agreed by the CPC members is implemented and the outcome back to the reportee by + the main contact. + +## Reports to coc-escalation@openjsf.org + +The following members are subscribed to the coc-escalation@openjsf.org mailing list: + +* The Foundation Executive Director +* 1 member from the Board +* 1 member from the CPC +* each top-level project may optionally provide 1 member +* the non top-level projects may optionally provide 1 member +* optionally 1 invited outside expert as agreed by the other CoCP members. + +The current list of members is documented in ./CODE_OF_CONDUCT_PANEL_MEMERS.md + +When a report is received the following actions will be taken: + + * One of the Code of Conduct Panel (CoCP) members will respond to the reportee confirming that the report has been received. + When possible the same person who responds initially will act as the point of contact for future conversations. + * If no respose has been send within 1 day the Foundation Executive Director will ensure a member of the Code of Conduct + Panel is identified as the main point of contact either through email or shceduling an meeting for the CoCP. + * The main point of contact will then ensure the following steps are completed: + 1. Report is acknowledged: The contact person responds to let the reportee know that the report is being discussed. + 2. Information gathering: Time is allocated to collect information in one place to make sure all CoCP members have access. + 3. Information is discussed: The facts are discussed in context of opinions. This can be done in the issue for the report, or + in a meeting in which case the key discussion points should then be added to the issue. + 4. An action to be taken is arrived at: The action to be taken is decided by consensus as per the standard CPC + [Decision Making](https://github.com/openjs-foundation/cross-project-council/blob/master/CPC-CHARTER.md#section-9-decision-making) process substituting in CoCP for references to the CPC. + 5. The proposed action is discussed with the leadership for the space to which the report applies (ex CPC or member + project leadership). If the leadership representatives expreses concerns then the + contact person will bring these back to the CoCP members for further discussion. This cycle can continue until the + CoPC members reach consensus that the leadership representatives concerns have been adquately addressed. + 6. Resolution offered: The resolution is offered to the reportee by the contact person. If the resolution is accepted as + reasonable or there is no response the process moves to the next step. If the reportee expreses concerns then the + contact person will bring these back to the CoCP members for further discussion. This cycle can continue until the + CoPC members reach consensus that the reportee's concerns have been adquately addressed. This may also require that + step 5 be repeated as well if the proposed action is modified. + 6. Final resolution: the resolution agreed by the CoCP members is implemented and the outcome reported back to the reportee by + the main contact. + From 1d5aaf2ad4b1cd7c705bae2243ed5dd5d67ef3e9 Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Fri, 6 Sep 2019 14:37:31 -0400 Subject: [PATCH 15/30] squash: fix typos --- proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md index aadf674f8..791487858 100644 --- a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md +++ b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md @@ -6,11 +6,11 @@ This process covers two types of reports based on ./FOUNDATION_CODE_OF_CONDUCT_R * Reports for spaces managed by the Cross Project Council (CPC) which come in through `report@opensjsf.org` * Escalations which come in through `coc-escalation@openjsf.org`. -Generall, reports to coc-escalation should refer to a report that was already submitted to: +Generally, reports to coc-escalation should refer to a report that was already submitted to: * report@openjsf.org or * one of the projects reporting emails -* explaination of why the reportee does not feel comfortable using the previous reporting emails for the initial report +* explanation of why the reportee does not feel comfortable using the previous reporting emails for the initial report If a report to coc-esclation do not include one of those, the reportee will be asked to to provide one of those three as the reason for reporting to coc-escalation. From 2eef5ce0e35c29ffeecd6ec4ba91c0e166ec301d Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Fri, 6 Sep 2019 14:38:57 -0400 Subject: [PATCH 16/30] squash: fix email for coc-escalation --- .../CODE_OF_CONDUCT/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proposals/stage-1/CODE_OF_CONDUCT/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md b/proposals/stage-1/CODE_OF_CONDUCT/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md index 02f8e3d6f..358814c75 100644 --- a/proposals/stage-1/CODE_OF_CONDUCT/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md +++ b/proposals/stage-1/CODE_OF_CONDUCT/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md @@ -44,7 +44,7 @@ in place by a project (for reports made to a project) or the CPC (in the case of reports relating to spaces within the scope of the foundation versus a project). In exceptional cases where a reporter wishes to challenge the response from the CPC or project, or does not feel comfortable reporting through the standard processes, an escalation -report can be made to coc-escalation@xxx.org. +report can be made to coc-escalation@openjsf.org. All escalations will be reviewed and investigated by the Code of Conduct Panel (CoCP) and will result in a response that is deemed necessary and appropriate to the circumstances. From 98902f7ad86345397d4c6fbd0139240cb604e972 Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Fri, 6 Sep 2019 14:44:45 -0400 Subject: [PATCH 17/30] squash: fixup --- .../stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md index 791487858..dd0ddd274 100644 --- a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md +++ b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md @@ -12,14 +12,14 @@ Generally, reports to coc-escalation should refer to a report that was already s * one of the projects reporting emails * explanation of why the reportee does not feel comfortable using the previous reporting emails for the initial report -If a report to coc-esclation do not include one of those, the reportee will be asked to to provide one of those three as the +If a report to coc-esclation does not include one of those, the reportee will be asked to to provide one of those three as the reason for reporting to coc-escalation. ## 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. -report@openjsf.org -> github.com/openjs-foundation/moderation -coc-escalation@openjsf.org -> github.com/openjs-foundation/coc-escalation +* report@openjsf.org -> github.com/openjs-foundation/moderation +* coc-escalation@openjsf.org -> github.com/openjs-foundation/coc-escalation For each report there should be an issue which captures the report, discussion and final conclusion. The report should NOT contain identifying details of the reporter. @@ -38,10 +38,10 @@ All members of the CPC are subscribed to the `report@openjsf.org` mailing list. 4. An action to be taken is arrived at: The action to be taken is decided by consensus as per the standard CPC [Decision Making](https://github.com/openjs-foundation/cross-project-council/blob/master/CPC-CHARTER.md#section-9-decision-making) process. 5. Resolution offered: The resolution is offered to the reportee by the contact person. If the resolution is accepted as - reasonable or there is no response the process moves to the next step. If the reportee expreses concerns then the + reasonable or there is no response within 7 days the process moves to the next step. If the reportee expreses concerns then the contact person will bring these back to the CPC members for further discussion. This cycle can continue until the CPC members reach consensus that the reportee's concerns have been adquately addressed. - 6. Final resolution: the resolution agreed by the CPC members is implemented and the outcome back to the reportee by + 6. Final resolution: the resolution agreed by the CPC members is implemented and the outcome reported to the reportee by the main contact. ## Reports to coc-escalation@openjsf.org @@ -61,8 +61,8 @@ When a report is received the following actions will be taken: * One of the Code of Conduct Panel (CoCP) members will respond to the reportee confirming that the report has been received. When possible the same person who responds initially will act as the point of contact for future conversations. - * If no respose has been send within 1 day the Foundation Executive Director will ensure a member of the Code of Conduct - Panel is identified as the main point of contact either through email or shceduling an meeting for the CoCP. + * If no respose has been sent within 1 day the Foundation Executive Director will ensure a member of the Code of Conduct + Panel is identified as the main point of contact either through email or scheduling an meeting for the CoCP. * The main point of contact will then ensure the following steps are completed: 1. Report is acknowledged: The contact person responds to let the reportee know that the report is being discussed. 2. Information gathering: Time is allocated to collect information in one place to make sure all CoCP members have access. @@ -75,7 +75,7 @@ When a report is received the following actions will be taken: contact person will bring these back to the CoCP members for further discussion. This cycle can continue until the CoPC members reach consensus that the leadership representatives concerns have been adquately addressed. 6. Resolution offered: The resolution is offered to the reportee by the contact person. If the resolution is accepted as - reasonable or there is no response the process moves to the next step. If the reportee expreses concerns then the + reasonable or there is no response within 7 days the process moves to the next step. If the reportee expreses concerns then the contact person will bring these back to the CoCP members for further discussion. This cycle can continue until the CoPC members reach consensus that the reportee's concerns have been adquately addressed. This may also require that step 5 be repeated as well if the proposed action is modified. From bd5837bc5ae1c61d0831cf338aedc43297ae4627 Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Fri, 6 Sep 2019 14:50:23 -0400 Subject: [PATCH 18/30] squash: add ref about members recusing themselves --- proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md index dd0ddd274..64a747507 100644 --- a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md +++ b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md @@ -23,6 +23,10 @@ Personal information is confidential. All reports should be recorded, together w For each report there should be an issue which captures the report, discussion and final conclusion. The report should NOT contain identifying details of the reporter. +## Conflict of Interest + +Any member of the CPC or CoCP who is involved in the report should recuse themselves from the discussions. + ## Reports to report@openjsf.org All members of the CPC are subscribed to the `report@openjsf.org` mailing list. When a report is received the following actions will be taken: From 366444effd2e107781b691e9c549db889b13433a Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Tue, 10 Sep 2019 17:39:54 -0400 Subject: [PATCH 19/30] Update proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md Co-Authored-By: Timmy Willison <4timmywil@gmail.com> --- proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md index 64a747507..b6427d789 100644 --- a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md +++ b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md @@ -32,7 +32,7 @@ Any member of the CPC or CoCP who is involved in the report should recuse themse All members of the CPC are subscribed to the `report@openjsf.org` mailing list. When a report is received the following actions will be taken: * One of the CPC members will respond to the reportee confirming that the report has been received. When possible the same person who responds initially will act as the point of contact for future conversations. - * If no respose has been send by the next CPC meeeting the CPC chair will ensure there is a private session in which the one of the + * If no response has been sent by the next CPC meeting, the CPC chair will ensure there is a private session in which the one of the CPC members is identified as the point of contact. * The point of contact will then ensure the following steps are completed: 1. Report is acknowledged: The contact person responds to let the reportee know that the report is being discussed. From 9671542cae9fe37c45e1ed7cd66d459630d45cd2 Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Tue, 10 Sep 2019 17:41:06 -0400 Subject: [PATCH 20/30] Update proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md Co-Authored-By: Timmy Willison <4timmywil@gmail.com> --- proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md index b6427d789..19c045446 100644 --- a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md +++ b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md @@ -42,7 +42,7 @@ All members of the CPC are subscribed to the `report@openjsf.org` mailing list. 4. An action to be taken is arrived at: The action to be taken is decided by consensus as per the standard CPC [Decision Making](https://github.com/openjs-foundation/cross-project-council/blob/master/CPC-CHARTER.md#section-9-decision-making) process. 5. Resolution offered: The resolution is offered to the reportee by the contact person. If the resolution is accepted as - reasonable or there is no response within 7 days the process moves to the next step. If the reportee expreses concerns then the + reasonable or there is no response within 7 days the process moves to the next step. If the reportee expresses concerns then the contact person will bring these back to the CPC members for further discussion. This cycle can continue until the CPC members reach consensus that the reportee's concerns have been adquately addressed. 6. Final resolution: the resolution agreed by the CPC members is implemented and the outcome reported to the reportee by From 377b53ebc0a56a75b98612e42b3fcb8bdb52ffe2 Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Tue, 10 Sep 2019 17:41:22 -0400 Subject: [PATCH 21/30] Update proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md Co-Authored-By: Timmy Willison <4timmywil@gmail.com> --- proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md index 19c045446..559c73ef1 100644 --- a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md +++ b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md @@ -66,7 +66,7 @@ When a report is received the following actions will be taken: * One of the Code of Conduct Panel (CoCP) members will respond to the reportee confirming that the report has been received. When possible the same person who responds initially will act as the point of contact for future conversations. * If no respose has been sent within 1 day the Foundation Executive Director will ensure a member of the Code of Conduct - Panel is identified as the main point of contact either through email or scheduling an meeting for the CoCP. + Panel is identified as the main point of contact either through email or scheduling a meeting for the CoCP. * The main point of contact will then ensure the following steps are completed: 1. Report is acknowledged: The contact person responds to let the reportee know that the report is being discussed. 2. Information gathering: Time is allocated to collect information in one place to make sure all CoCP members have access. From 6d12e324eebe765c05b42cf1d600c8c6f5b7e0b4 Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Tue, 10 Sep 2019 17:41:45 -0400 Subject: [PATCH 22/30] Update proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md Co-Authored-By: Timmy Willison <4timmywil@gmail.com> --- proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md index 559c73ef1..d1f603e6b 100644 --- a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md +++ b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md @@ -65,7 +65,7 @@ When a report is received the following actions will be taken: * One of the Code of Conduct Panel (CoCP) members will respond to the reportee confirming that the report has been received. When possible the same person who responds initially will act as the point of contact for future conversations. - * If no respose has been sent within 1 day the Foundation Executive Director will ensure a member of the Code of Conduct + * If no response has been sent within 1 day the Foundation Executive Director will ensure a member of the Code of Conduct Panel is identified as the main point of contact either through email or scheduling a meeting for the CoCP. * The main point of contact will then ensure the following steps are completed: 1. Report is acknowledged: The contact person responds to let the reportee know that the report is being discussed. From 37c299944f9eac57d04c81c3a95edec573f9649c Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Tue, 10 Sep 2019 17:41:59 -0400 Subject: [PATCH 23/30] Update proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md Co-Authored-By: Timmy Willison <4timmywil@gmail.com> --- proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md index d1f603e6b..a4f0462ec 100644 --- a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md +++ b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md @@ -77,7 +77,7 @@ When a report is received the following actions will be taken: 5. The proposed action is discussed with the leadership for the space to which the report applies (ex CPC or member project leadership). If the leadership representatives expreses concerns then the contact person will bring these back to the CoCP members for further discussion. This cycle can continue until the - CoPC members reach consensus that the leadership representatives concerns have been adquately addressed. + CoPC members reach consensus that the leadership representatives concerns have been adequately addressed. 6. Resolution offered: The resolution is offered to the reportee by the contact person. If the resolution is accepted as reasonable or there is no response within 7 days the process moves to the next step. If the reportee expreses concerns then the contact person will bring these back to the CoCP members for further discussion. This cycle can continue until the From d475032eb9cdc564dc0f4996e88c46df13cf7abb Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Tue, 10 Sep 2019 17:42:19 -0400 Subject: [PATCH 24/30] Update proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md Co-Authored-By: Timmy Willison <4timmywil@gmail.com> --- proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md index a4f0462ec..6c032c594 100644 --- a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md +++ b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md @@ -79,7 +79,7 @@ When a report is received the following actions will be taken: contact person will bring these back to the CoCP members for further discussion. This cycle can continue until the CoPC members reach consensus that the leadership representatives concerns have been adequately addressed. 6. Resolution offered: The resolution is offered to the reportee by the contact person. If the resolution is accepted as - reasonable or there is no response within 7 days the process moves to the next step. If the reportee expreses concerns then the + reasonable or there is no response within 7 days the process moves to the next step. If the reportee expresses concerns then the contact person will bring these back to the CoCP members for further discussion. This cycle can continue until the CoPC members reach consensus that the reportee's concerns have been adquately addressed. This may also require that step 5 be repeated as well if the proposed action is modified. From 84e940645ec37e34fd26180fd807c0aa62baba7d Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Tue, 10 Sep 2019 17:42:37 -0400 Subject: [PATCH 25/30] Update proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md Co-Authored-By: Timmy Willison <4timmywil@gmail.com> --- proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md index 6c032c594..cfb5f7379 100644 --- a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md +++ b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md @@ -81,7 +81,7 @@ When a report is received the following actions will be taken: 6. Resolution offered: The resolution is offered to the reportee by the contact person. If the resolution is accepted as reasonable or there is no response within 7 days the process moves to the next step. If the reportee expresses concerns then the contact person will bring these back to the CoCP members for further discussion. This cycle can continue until the - CoPC members reach consensus that the reportee's concerns have been adquately addressed. This may also require that + CoPC members reach consensus that the reportee's concerns have been adequately addressed. This may also require that step 5 be repeated as well if the proposed action is modified. 6. Final resolution: the resolution agreed by the CoCP members is implemented and the outcome reported back to the reportee by the main contact. From f575cec9fcc2191c2293ae5f8fe3f5c60202c31e Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Tue, 10 Sep 2019 17:42:55 -0400 Subject: [PATCH 26/30] Update proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md Co-Authored-By: Timmy Willison <4timmywil@gmail.com> --- proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md index cfb5f7379..a5cce2e0f 100644 --- a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md +++ b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md @@ -75,7 +75,7 @@ When a report is received the following actions will be taken: 4. An action to be taken is arrived at: The action to be taken is decided by consensus as per the standard CPC [Decision Making](https://github.com/openjs-foundation/cross-project-council/blob/master/CPC-CHARTER.md#section-9-decision-making) process substituting in CoCP for references to the CPC. 5. The proposed action is discussed with the leadership for the space to which the report applies (ex CPC or member - project leadership). If the leadership representatives expreses concerns then the + project leadership). If the leadership representatives expresses concerns then the contact person will bring these back to the CoCP members for further discussion. This cycle can continue until the CoPC members reach consensus that the leadership representatives concerns have been adequately addressed. 6. Resolution offered: The resolution is offered to the reportee by the contact person. If the resolution is accepted as From d84e0d3b61e79518c9a24b2517ed087e0e46e077 Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Tue, 10 Sep 2019 19:20:43 -0400 Subject: [PATCH 27/30] squash: Address @kborchers comments --- proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md index a5cce2e0f..f093d4fc7 100644 --- a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md +++ b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md @@ -9,7 +9,7 @@ This process covers two types of reports based on ./FOUNDATION_CODE_OF_CONDUCT_R Generally, reports to coc-escalation should refer to a report that was already submitted to: * report@openjsf.org or -* one of the projects reporting emails +* one of the project's reporting emails * explanation of why the reportee does not feel comfortable using the previous reporting emails for the initial report If a report to coc-esclation does not include one of those, the reportee will be asked to to provide one of those three as the @@ -25,14 +25,14 @@ For each report there should be an issue which captures the report, discussion a ## Conflict of Interest -Any member of the CPC or CoCP who is involved in the report should recuse themselves from the discussions. +Any member of the CPC or Code of Conduct Panel(CoCP) who is involved in the report should recuse themselves from the discussions. ## Reports to report@openjsf.org All members of the CPC are subscribed to the `report@openjsf.org` mailing list. When a report is received the following actions will be taken: * One of the CPC members will respond to the reportee confirming that the report has been received. When possible the same person who responds initially will act as the point of contact for future conversations. - * If no response has been sent by the next CPC meeting, the CPC chair will ensure there is a private session in which the one of the + * If no response has been sent by the next CPC meeting, the CPC chair will ensure there is a private session in which one of the CPC members is identified as the point of contact. * The point of contact will then ensure the following steps are completed: 1. Report is acknowledged: The contact person responds to let the reportee know that the report is being discussed. From a58aa13ac14726aba7a64acec14391ad4c309161 Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Thu, 12 Sep 2019 10:04:05 -0400 Subject: [PATCH 28/30] Update proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md Co-Authored-By: Matteo Collina --- proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md index f093d4fc7..d0aff04c3 100644 --- a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md +++ b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md @@ -81,7 +81,7 @@ When a report is received the following actions will be taken: 6. Resolution offered: The resolution is offered to the reportee by the contact person. If the resolution is accepted as reasonable or there is no response within 7 days the process moves to the next step. If the reportee expresses concerns then the contact person will bring these back to the CoCP members for further discussion. This cycle can continue until the - CoPC members reach consensus that the reportee's concerns have been adequately addressed. This may also require that + CoCP members reach consensus that the reportee's concerns have been adequately addressed. This may also require that step 5 be repeated as well if the proposed action is modified. 6. Final resolution: the resolution agreed by the CoCP members is implemented and the outcome reported back to the reportee by the main contact. From 20ea625d38909732827344d762163f535c2f6e26 Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Thu, 12 Sep 2019 10:09:24 -0400 Subject: [PATCH 29/30] squash: address comments from @mcollina --- .../stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md index d0aff04c3..7c4c104aa 100644 --- a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md +++ b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md @@ -50,16 +50,8 @@ All members of the CPC are subscribed to the `report@openjsf.org` mailing list. ## Reports to coc-escalation@openjsf.org -The following members are subscribed to the coc-escalation@openjsf.org mailing list: - -* The Foundation Executive Director -* 1 member from the Board -* 1 member from the CPC -* each top-level project may optionally provide 1 member -* the non top-level projects may optionally provide 1 member -* optionally 1 invited outside expert as agreed by the other CoCP members. - -The current list of members is documented in ./CODE_OF_CONDUCT_PANEL_MEMERS.md +All members of the [Code of Conduct Panel (CoCP)](.FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md#code-of-conduct-panel) +are subscribed to the coc-escalation@openjsf.org mailing list. The current list of members is documented in ./CODE_OF_CONDUCT_PANEL_MEMERS.md. When a report is received the following actions will be taken: From d72c6236c16da2a9decb789ed740a597f697d9de Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Tue, 17 Sep 2019 14:20:28 -0400 Subject: [PATCH 30/30] Update proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md Co-Authored-By: Matteo Collina --- proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md index 7c4c104aa..a1e8836d5 100644 --- a/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md +++ b/proposals/stage-1/CODE_OF_CONDUCT/HANDLING-REPORTS.md @@ -69,7 +69,7 @@ When a report is received the following actions will be taken: 5. The proposed action is discussed with the leadership for the space to which the report applies (ex CPC or member project leadership). If the leadership representatives expresses concerns then the contact person will bring these back to the CoCP members for further discussion. This cycle can continue until the - CoPC members reach consensus that the leadership representatives concerns have been adequately addressed. + CoCP members reach consensus that the leadership representatives concerns have been adequately addressed. 6. Resolution offered: The resolution is offered to the reportee by the contact person. If the resolution is accepted as reasonable or there is no response within 7 days the process moves to the next step. If the reportee expresses concerns then the contact person will bring these back to the CoCP members for further discussion. This cycle can continue until the