diff --git a/CONTRIBUTING/WORKFLOW.md b/CONTRIBUTING/WORKFLOW.md index 23104b3ed2..e6c07a58ac 100644 --- a/CONTRIBUTING/WORKFLOW.md +++ b/CONTRIBUTING/WORKFLOW.md @@ -48,6 +48,8 @@ The \*forgejo-development branch is based on the {vX.Y/,}forgejo-ci branch which The purpose of each *Feature branch* is documented below: +### General purpose + * [forgejo-ci](https://codeberg.org/forgejo/forgejo/src/branch/forgejo-ci) based on [main](https://codeberg.org/forgejo/forgejo/src/branch/main) Woodpecker CI configuration, including the release process. * Backports: [v1.18/forgejo-ci](https://codeberg.org/forgejo/forgejo/src/branch/v1.18/forgejo-ci) @@ -56,6 +58,11 @@ The purpose of each *Feature branch* is documented below: Forgejo development tools and documentation. * Backports: [v1.18/forgejo-development](https://codeberg.org/forgejo/forgejo/src/branch/v1.18/forgejo-development) +### [Federation](https://codeberg.org/forgejo/forgejo/issues?labels=79349) + +* [forgejo-federation](https://codeberg.org/forgejo/forgejo/src/branch/forgejo-federation) based on [forgejo-development](https://codeberg.org/forgejo/forgejo/src/branch/forgejo-development) + Federation support for Forgejo + ## Pull requests and feature branches Most people who are used to contributing will be familiar with the workflow of sending a pull request against the default branch. When that happens the reviewer should change the base branch to the appropriate *Feature branch* instead. If the pull request does not fit in any *Feature branch*, the reviewer needs to make decision to either: