From 3c927f46d072899c7c8c2ab2466cae448ebd7ed8 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Tue, 2 May 2023 22:49:55 +0200 Subject: [PATCH] update to v1.19 --- developer/COC.md | 31 ++----------------------------- developer/DISCUSSIONS.md | 2 +- developer/GOVERNANCE.md | 12 +----------- developer/WORKFLOW.md | 7 ++++--- 4 files changed, 8 insertions(+), 44 deletions(-) diff --git a/developer/COC.md b/developer/COC.md index e1ee41a7..f9c59f04 100644 --- a/developer/COC.md +++ b/developer/COC.md @@ -1,34 +1,7 @@ --- layout: '~/layouts/Markdown.astro' -title: Code of Conduct, Well Being and Moderation teams +title: Code of Conduct and moderation team license: 'CC-BY-SA-4.0' --- -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/developer/DISCUSSIONS.md b/developer/DISCUSSIONS.md index 3786a9f7..2699a9e1 100644 --- a/developer/DISCUSSIONS.md +++ b/developer/DISCUSSIONS.md @@ -12,7 +12,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/developer/GOVERNANCE.md b/developer/GOVERNANCE.md index ba6add3e..52252972 100644 --- a/developer/GOVERNANCE.md +++ b/developer/GOVERNANCE.md @@ -10,14 +10,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/developer/WORKFLOW.md b/developer/WORKFLOW.md index 4cdcdde3..a58c1556 100644 --- a/developer/WORKFLOW.md +++ b/developer/WORKFLOW.md @@ -28,7 +28,7 @@ Before rebasing on top of Gitea, all branches are copied to `soft-fork/YYYY-MM-D ### Tags -Because the branches are rebased on top of Gitea, only the latest tag will be found in a given branch. For instance `v1.19.0-1` won't be found in the `v1.19/forgejo` branch after it is rebased. +Because the branches are rebased on top of Gitea, only the latest tag will be found in a given branch. For instance `v1.18.0-1` won't be found in the `v1.18/forgejo` branch after it is rebased. ## Rebasing @@ -97,16 +97,17 @@ The purpose of each _Feature branch_ is documented below: - [forgejo-branding](https://codeberg.org/forgejo/forgejo/src/branch/forgejo-branding) based on [forgejo-development](https://codeberg.org/forgejo/forgejo/src/branch/forgejo-development) Replacing upstream branding with Forgejo branding + - Backports: [v1.19/forgejo-branding](https://codeberg.org/forgejo/forgejo/src/branch/v1.19/forgejo-branding) ### [Internationalization](https://codeberg.org/forgejo/forgejo/issues?labels=82637) - [forgejo-i18n](https://codeberg.org/forgejo/forgejo/src/branch/forgejo-i18n) based on [forgejo-development](https://codeberg.org/forgejo/forgejo/src/branch/forgejo-development) Internationalization support for Forgejo with a workflow based on Weblate. + - Backports: [v1.19/forgejo-i18n](https://codeberg.org/forgejo/forgejo/src/branch/v1.19/forgejo-i18n) ### [Accessibility](https://codeberg.org/forgejo/forgejo/issues?labels=81214) -- Backports only: [v1.19/forgejo-a11y](https://codeberg.org/forgejo/forgejo/src/branch/v1.19/forgejo-a11y) based on [v1.19/forgejo-development](https://codeberg.org/forgejo/forgejo/src/branch/v1.19/forgejo-development) - Backport future upstream a11y improvements to the current release of Forgejo +- [forgejo-a11y](https://codeberg.org/forgejo/forgejo/src/branch/forgejo-a11y) based on [forgejo-development](https://codeberg.org/forgejo/forgejo/src/branch/forgejo-development) ### [Federation](https://codeberg.org/forgejo/forgejo/issues?labels=79349)