Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update and refactor CoC policy and processes #1135

Merged
merged 90 commits into from
Feb 24, 2024
Merged

Update and refactor CoC policy and processes #1135

merged 90 commits into from
Feb 24, 2024

Conversation

tobie
Copy link
Contributor

@tobie tobie commented Aug 8, 2023

  • Clearly split all CoC related-documents into 4 buckets:
    1. The Code of Conduct itself, which is also the source of truth for the makeup of the CoC Team, how to contact the CoC Team, and how to report an incident, escalate it, and appeal a decision.
    2. The Code of Conduct Policy, which defines the higher level aspects of our code of conduct implementation (the what).
    3. The CoC Team Charter which is the mean by which the CPC delegates responsibilities to the CoC Team.
    4. Various related processes which describe how the policy is implemented.
  • Replace the Code of Conduct Panel with a Code of Conduct Team instead.
  • Standardize on the language used in the Contributor Covenant and in the CNCF and use it consistently throughout.
  • Clarify the escalation and appeal policies.
  • Be explicit about the projects's freedom to implement moderation policies
  • Create a placeholder for all of the processes related to the makeup and structure of the CoC Team.
  • Add an indication at the top of each related file pointing people who just want to report an incident to the right place.
  • Clean up a number of smaller issues.
  • Clarify the requirements for projects who opt-in to manage incident reports themselves. Make the policy generic so that it applies both to those projects and to the CoC. Partially addresses Clarify requirements around CoC violation #786.

Still to do:

  • Decide whether it is better to separate report@, coc-escalation@, and coc-appeal@ or just use report@ for all the things. Decided to use just one email: coc@openjsf.org
    • Add or remove email lists accordingly
    • Update the CoC accordingly.
  • Add the CoC Team Charter (and in particular clarify the makeup and selection process of the CoC Team) (@PaulaPaul).
  • Should the privacy policy also protect the accused person, and if so, what are the necessary exceptions?
  • Reach out to projects who would be affected by these changes (tracking in Update onboarding and post-graduation checklists to match new CoC policy #1255).
  • Address concerns raised by @bnb:
    • There's no clear definition of conflict of interest. Agreement that we need a conflict of interest policy, but can we land this PR without it? (Link to comment)
    • What constitutes report mishandling needs to be defined more clearly. (Link to comment)
    • The escalation and appeal policy described in this PR allow the CoC Team to reverse decisions made at the project level in certain fairly scoped situations. There isn't consensus about this. (Link to comment)
    • The current policy delegates defining case handling processes to the CoC Team. There isn't consensus about this. (Link to comment)
    • There isn't consensus that having a CoC Chair is useful. (Link to comment)
    • There isn't consensus about eligibility criteria. (Link to comment)

This is now ready to land pending:

  • @bnb to confirm they're no longer blocking (commenting didn't remove the block) (marked as done as we can work around the technical issue)
  • @eemeli to confirm he's happy with the provisions around confidentiality of accused individuals
  • agreement to remove obsolete incident management process and reference it by a link to versioned content

@tobie tobie added the TOPIC-code-of-conduct All issues related to the CoC update and process label Aug 8, 2023
@tobie tobie mentioned this pull request Aug 8, 2023
15 tasks
@tobie tobie force-pushed the coc branch 3 times, most recently from 18b023b to 808ab78 Compare August 25, 2023 12:14
conduct/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md Outdated Show resolved Hide resolved
conduct/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md Outdated Show resolved Hide resolved
CODE_OF_CONDUCT.md Outdated Show resolved Hide resolved
@tobie tobie self-assigned this Nov 22, 2023
@tobie tobie marked this pull request as ready for review November 22, 2023 11:14
@tobie tobie requested a review from a team as a code owner November 22, 2023 11:14
Copy link
Member

@mcollina mcollina left a comment

Choose a reason for hiding this comment

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

lgtm

@tobie tobie force-pushed the coc branch 2 times, most recently from b692f74 to fa51125 Compare November 22, 2023 14:03
@tobie tobie changed the title Update structure, nomination, and processes of CoC Team Update and refactor CoC policy and processes Nov 22, 2023
CODE_OF_CONDUCT.md Outdated Show resolved Hide resolved
conduct/COC_POLICY.md Outdated Show resolved Hide resolved
conduct/COC_POLICY.md Outdated Show resolved Hide resolved
conduct/COC_POLICY.md Outdated Show resolved Hide resolved
conduct/COC_POLICY.md Outdated Show resolved Hide resolved
conduct/COC_POLICY.md Outdated Show resolved Hide resolved
conduct/COC_POLICY.md Outdated Show resolved Hide resolved
conduct/COC_PROCESS_FOR_COC_TEAM.md Outdated Show resolved Hide resolved
conduct/COC_PROCESS_FOR_COC_TEAM.md Outdated Show resolved Hide resolved
conduct/COC_PROCESS_FOR_INCIDENT_MANAGEMENT.md Outdated Show resolved Hide resolved
conduct/COC_POLICY.md Outdated Show resolved Hide resolved
conduct/COC_POLICY.md Outdated Show resolved Hide resolved
conduct/COC_PROCESS_FOR_INCIDENT_MANAGEMENT.md Outdated Show resolved Hide resolved
conduct/COC_POLICY.md Outdated Show resolved Hide resolved
@tobie tobie requested a review from eemeli November 23, 2023 12:30
@tobie
Copy link
Contributor Author

tobie commented Nov 23, 2023

Thank for your thorough review, @eemeli. I think I've answered or addressed the issues you raised. I've now marked them as resolved. Feel free to LMK if you disagree with my responses. Thanks again for chiming in. Much appreciated!

@tobie tobie requested a review from a team November 23, 2023 12:32
conduct/COC_POLICY.md Outdated Show resolved Hide resolved
CODE_OF_CONDUCT.md Outdated Show resolved Hide resolved
CODE_OF_CONDUCT.md Outdated Show resolved Hide resolved
CODE_OF_CONDUCT.md Outdated Show resolved Hide resolved
tobie and others added 18 commits February 24, 2024 22:10
Signed-off-by: Tobie Langel <tobie@unlockopen.com>
Signed-off-by: Tobie Langel <tobie@unlockopen.com>
…scalation

Allow CoC Team to involve CPC if necessary and project leadership if appropriate.
Signed-off-by: Tobie Langel <tobie@unlockopen.com>
Signed-off-by: Tobie Langel <tobie@unlockopen.com>
Signed-off-by: Tobie Langel <tobie@unlockopen.com>
Signed-off-by: Tobie Langel <tobie@unlockopen.com>
Signed-off-by: Tobie Langel <tobie@unlockopen.com>
Signed-off-by: Tobie Langel <tobie@unlockopen.com>
Signed-off-by: Tobie Langel <tobie@unlockopen.com>
Co-authored-by: Eemeli Aro <eemeli@gmail.com>
Signed-off-by: Tobie Langel <tobie@unlockopen.com>
Co-authored-by: Mohammed Keyvanzadeh <mohammadkeyvanzade94@gmail.com>
Signed-off-by: Tobie Langel <tobie@unlockopen.com>
Signed-off-by: Tobie Langel <tobie@unlockopen.com>
@ljharb
Copy link
Member

ljharb commented Mar 1, 2024

Seems like this PR removed this page: https://github.com/openjs-foundation/cross-project-council/blob/0c30a269acb2cc0b22cf3c62b8389e779bda0101~1/conduct/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md but the link still exists somewhere, so the link checker is failing

@tobie
Copy link
Contributor Author

tobie commented Mar 1, 2024

Must have missed this one which is in meeting minutes:

* From: https://github.com/openjs-foundation/cross-project-council/blob/HEAD/conduct/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md we’d need coc-escalation@xxx.org and report@xxxx.org

It's kind of weird to be editing minutes years later for this, tbh.

@ljharb
Copy link
Member

ljharb commented Mar 1, 2024

true, but cool URLs don't change, so the alternative is never fully removing any markdown files :-)

bensternthal pushed a commit to bensternthal/cross-project-council that referenced this pull request Apr 23, 2024
- Clearly split all CoC related-documents into 4 buckets:
    1. The **Code of Conduct** itself, which is also the source of truth for the makeup of the CoC Team, how to contact the CoC Team, and how to report an incident, escalate it, and appeal a decision.
    2. The **Code of Conduct Policy**, which defines the higher level aspects of our code of conduct implementation (the _what_).
    3. The **CoC Team Charter** which is the mean by which the CPC delegates responsibilities to the CoC Team.
    4. Various related **processes** which describe _how_ the policy is implemented.
- Replace the Code of Conduct Panel with a Code of Conduct Team instead.
- Standardize on the language used in the Contributor Covenant and in the CNCF and use it consistently throughout.
- Clarify the escalation and appeal policies.
- Be explicit about the projects's freedom to implement moderation policies
- Create a placeholder for all of the processes related to the makeup and structure of the CoC Team.
- Add an indication at the top of each related file pointing people who just want to report an incident to the right place.
- Clean up a number of smaller issues.
- Clarify the requirements for projects who opt-in to manage incident reports themselves. Make the policy generic so that it applies both to those projects and to the CoC.

---------

Signed-off-by: Tobie Langel <tobie@unlockopen.com>
Signed-off-by: Paula <8395352+PaulaPaul@users.noreply.github.com>
Co-authored-by: Michael Dawson <mdawson@devrus.com>
Co-authored-by: Jordan Harband <ljharb@gmail.com>
Co-authored-by: Mohammed Keyvanzadeh <mohammadkeyvanzade94@gmail.com>
Co-authored-by: Ben Hutton <relequestual@gmail.com>
Co-authored-by: Paula <8395352+PaulaPaul@users.noreply.github.com>
Co-authored-by: Eemeli Aro <eemeli@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cross-project-council-agenda TOPIC-code-of-conduct All issues related to the CoC update and process
Projects
None yet
Development

Successfully merging this pull request may close these issues.