From df749da27225ee13b5e00b689b397b24afebd044 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Sat, 25 Mar 2023 09:34:45 +0100 Subject: [PATCH] [DOCS] CONTRIBUTING: updates * Remove obsolete description of the well being & moderation team and replace them with a link to the moderation email. * Remove description of the governance process and replace with a link to the governance readme that did not exist at the time. * Add links to the Forgejo documentation --- CONTRIBUTING.md | 1 + CONTRIBUTING/COC.md | 31 ++----------------------------- CONTRIBUTING/DISCUSSIONS.md | 2 +- CONTRIBUTING/GOVERNANCE.md | 12 +----------- README.md | 4 +--- 5 files changed, 6 insertions(+), 44 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c0a95c2678..cf589d3a7a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,6 +6,7 @@ Sensitive security-related issues should be reported to [security@forgejo.org](m ## For everyone involved +- [Documentation](https://forgejo.org/docs/latest/) - [Code of Conduct](CONTRIBUTING/COC.md) - [Bugs, features, security and others discussions](CONTRIBUTING/DISCUSSIONS.md) - [Governance](CONTRIBUTING/GOVERNANCE.md) diff --git a/CONTRIBUTING/COC.md b/CONTRIBUTING/COC.md index 2e370558a5..6408047450 100644 --- a/CONTRIBUTING/COC.md +++ b/CONTRIBUTING/COC.md @@ -1,30 +1,3 @@ -# Code of Conduct, Well Being and Moderation teams +# Code of Conduct and Moderation team -Forgejo strives to be an inclusive project where everyone can participate in a safe environment. The **Well Being** team is doing its best to defuse tensions before they escalate and is available to answer all requests sent its way. When diplomacy fails, the **Moderation** team will be forced to act to put a stop to actions that are contrary to the [Code of Conduct](https://codeberg.org/forgejo/code-of-conduct). - -## Well Being and Moderation teams - -Temporary Well Being and Moderation teams [were appointed 10 November 2022](https://codeberg.org/forgejo/meta/issues/13). - -The moderation team will rely on this [Code of Conduct](https://codeberg.org/forgejo/code-of-conduct) when diplomacy fails. - -### Well Being - -Their goal is to defuse tensions. - -It has no power whatsover. The members are approved by the organization and trusted to: - -- Read all communications to detect tensions between people before they escalate. -- Do their best to defuse tensions. - -* https://codeberg.org/Gusted - -### Moderation - -Their goal is to enforce the [Code of Conduct](https://codeberg.org/forgejo/code-of-conduct) when diplomacy fails. - -It has the power to exclude people from a space. - -Their decisions must be logical, fact based and transparent to the Forgejo community who trust them with this responsibility. - -* https://codeberg.org/circlebuilder +Forgejo strives to be an inclusive project where everyone can participate in a safe environment. If a Forgejo community member feels unsafe for any reason, the **Moderation team** is available at `moderation@forgejo.org` and will put a stop to actions that are contrary to the [Code of Conduct](https://codeberg.org/forgejo/code-of-conduct) or the law. diff --git a/CONTRIBUTING/DISCUSSIONS.md b/CONTRIBUTING/DISCUSSIONS.md index e8ceef67db..aaaef1c736 100644 --- a/CONTRIBUTING/DISCUSSIONS.md +++ b/CONTRIBUTING/DISCUSSIONS.md @@ -7,7 +7,7 @@ Dedicated repositories in the [Forgejo organization](https://codeberg.org/forgej - the [Code of Conduct](https://codeberg.org/forgejo/code-of-conduct) - the [sustainability and funding](https://codeberg.org/forgejo/sustainability). -Other discussions regarding all **non technical aspects** of Forgejo, such as the governance, happen in the [meta issue tracker](https://codeberg.org/forgejo/meta/issues) and in the [matrix chatroom](https://matrix.to/#/#forgejo-chat:matrix.org). +Other discussions regarding all **non technical aspects** of Forgejo, such as the governance, happen in a dedicated [issue tracker](https://codeberg.org/forgejo/discussions/issues) and in the [matrix chatroom](https://matrix.to/#/#forgejo-chat:matrix.org). # Security diff --git a/CONTRIBUTING/GOVERNANCE.md b/CONTRIBUTING/GOVERNANCE.md index 4a331fc2a5..7499185b57 100644 --- a/CONTRIBUTING/GOVERNANCE.md +++ b/CONTRIBUTING/GOVERNANCE.md @@ -6,14 +6,4 @@ The Forgejo [domains](https://codeberg.org/forgejo/meta/issues/41) are owned by ## Forgejo Governance -See our [decision-making system](https://codeberg.org/forgejo/meta/src/branch/readme/DECISION-MAKING.md) (contains team agreements and guidelines). - -Forgejo was bootstraped in November 2022 and is in the process of [defining its governance](https://codeberg.org/forgejo/meta/issues/19). The [first meeting happened November 24th](https://codeberg.org/forgejo/meta/issues/19#issuecomment-694460) and everyone is welcome to participate. - -## Interim Forgejo Governance - -While the governance is being defined, there was a need to establish an interim Forgejo governance for safeguarding credentials, enforcing the Code of Conduct and ensuring security vulnerabilities are handled responsibly for the Forgejo releases. - -All people with a role in the interim Forgejo governance pledge to resign as soon as the Forgejo governance is in place. - -The people and teams that are part of the interim governance are [listed publicly](https://codeberg.org/forgejo/meta/src/branch/readme/TEAMS.md). +Forgejo was bootstraped in November 2022 and [defined its governance](https://codeberg.org/forgejo/governance/src/branch/main/README.md) in the following months. diff --git a/README.md b/README.md index d61bdd0ec9..9795017320 100644 --- a/README.md +++ b/README.md @@ -35,12 +35,10 @@ If you like any of the following, Forgejo is literally meant for you: - Privacy: From update checker to default settings: Forgejo is built to be **privacy first** for you and your crew. - Federation: (WIP) We are actively working to connect software forges with each other through **ActivityPub**, and create a collaborative network of personal instances. - Interested? [Read more](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/CONTRIBUTING/WORKFLOW.md#federation-https-codeberg-org-forgejo-forgejo-issues-labels-79349) ## Learn more -Subscribe to releases and blog post on [our website](https://forgejo.org), find us on the Fediverse or hop into [our Matrix room](https://matrix.to/#/#forgejo-chat:matrix.org) if you have any questions or want to get involved. - +Dive into the [documentation](https://forgejo.org/docs/latest/), subscribe to releases and blog post on [our website](https://forgejo.org), find us on the Fediverse or hop into [our Matrix room](https://matrix.to/#/#forgejo-chat:matrix.org) if you have any questions or want to get involved. ## Get involved