diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fc598c4ec8..9e6b2b8808 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,26 +4,20 @@ The Forgejo project is run by a community of people who are expected to follow t Sensitive security-related issues should be reported to [security@forgejo.org](mailto:security@forgejo.org) using [encryption](https://keyoxide.org/security@forgejo.org). -# Table of Contents +## For everyone involved - [Code of Conduct](CONTRIBUTING/COC.md) -- [Bugs, features and discussions](#bugs-features-and-discussions) -- [Developer Certificate of Origin (DCO)](#developer-certificate-of-origin-dco) -- [Development workflow](CONTRIBUTING/WORKFLOW.md) -- [Release management](CONTRIBUTING/RELEASE.md) +- [Bugs, features, security and others discussions](CONTRIBUTING/DISCUSSIONS.md) - [Governance](CONTRIBUTING/GOVERNANCE.md) -- [Secrets](CONTRIBUTING/SECRETS.md) -- [Security](CONTRIBUTING/SECURITY.md) - [Funding](CONTRIBUTING/FUNDING.md) -# Bugs, features and discussions +## For contributors -The [Forgejo issue tracker](https://codeberg.org/forgejo/forgejo/issues) is where bugs should be reported and features requested. +- [Developer Certificate of Origin (DCO)](CONTRIBUTING/DCO.md) +- [Development workflow](CONTRIBUTING/WORKFLOW.md) -Discussions regarding all non technical aspects of Forgejo, such as the governance, [happen in the **meta** issue tracker](https://codeberg.org/forgejo/meta/issues). +## For maintainers -Other repositories in the [Forgejo organization](https://codeberg.org/forgejo) cover areas such as the [website](https://codeberg.org/forgejo/website), the [Code of Conduct](https://codeberg.org/forgejo/code-of-conduct) and more. +- [Release management](CONTRIBUTING/RELEASE.md) +- [Secrets](CONTRIBUTING/SECRETS.md) -# Developer Certificate of Origin (DCO) - -Contributions to Forgejo, in all the repositories in the [Forgejo organization](https://codeberg.org/forgejo) are accepted provided the author agrees to the [Developer Certificate of Origin (DCO)](CONTRIBUTING/DCO.txt). diff --git a/CONTRIBUTING/DCO.txt b/CONTRIBUTING/DCO.md similarity index 80% rename from CONTRIBUTING/DCO.txt rename to CONTRIBUTING/DCO.md index be34fc5dc3..4599b95fd1 100644 --- a/CONTRIBUTING/DCO.txt +++ b/CONTRIBUTING/DCO.md @@ -1,3 +1,8 @@ +# Developer Certificate of Origin (DCO) + +Contributions to Forgejo, in all the repositories in the [Forgejo organization](https://codeberg.org/forgejo) are accepted provided the author agrees to the following Developer Certificate of Origin (DCO). + +``` By making a contribution to Forgejo, I certify that: (a) The contribution was created in whole or in part by me and I @@ -21,3 +26,4 @@ By making a contribution to Forgejo, I certify that: personal information I submit with it, including my sign-off) is maintained indefinitely and may be redistributed consistent with this project or the Free Software license(s) involved. +``` \ No newline at end of file diff --git a/CONTRIBUTING/DISCUSSIONS.md b/CONTRIBUTING/DISCUSSIONS.md new file mode 100644 index 0000000000..3a9814241c --- /dev/null +++ b/CONTRIBUTING/DISCUSSIONS.md @@ -0,0 +1,18 @@ +# Bugs, features and discussions + +The [Forgejo issue tracker](https://codeberg.org/forgejo/forgejo/issues) is where **bugs** should be reported and **features** requested. + +Dedicated repositories in the [Forgejo organization](https://codeberg.org/forgejo) cover areas such as: +- the [website](https://codeberg.org/forgejo/website) +- the [Code of Conduct](https://codeberg.org/forgejo/code-of-conduct) +- the [funding](https://codeberg.org/forgejo/funding). + +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). + +# Security + +The [security team](https://codeberg.org/org/forgejo/teams/security) handle security vulnerabilities. It handles sensitive security-related issues reported to [security@forgejo.org](mailto:security@forgejo.org) using [encryption](https://keyoxide.org/security@forgejo.org). + +The security team also keeps the content of the [security.txt](https://codeberg.org/forgejo/website/src/branch/main/public/.well-known/security.txt) file up to date. + +The private GPG key for `security@forgejo.org` is shared among all members of the security team and not stored online. diff --git a/CONTRIBUTING/FUNDING.md b/CONTRIBUTING/FUNDING.md index b634220634..40c8a0bd9f 100644 --- a/CONTRIBUTING/FUNDING.md +++ b/CONTRIBUTING/FUNDING.md @@ -18,4 +18,4 @@ * [A solution for sustaining Free Software forge development](https://blog.dachary.org/2022/11/05/a-solution-for-sustaining-forge-development/) * A French company delegates an employee for X month * The employee's time is paid for by [R&D incentive](https://fr.wikipedia.org/wiki/Cr%C3%A9dit_d%27imp%C3%B4t_recherche) -* [Donations to Codeberg](https://codeberg.org/codename/meta/issues/26) +* [Donations to Codeberg](https://codeberg.org/forgejo/meta/issues/26) diff --git a/CONTRIBUTING/SECURITY.md b/CONTRIBUTING/SECURITY.md deleted file mode 100644 index cc9800cc7c..0000000000 --- a/CONTRIBUTING/SECURITY.md +++ /dev/null @@ -1,7 +0,0 @@ -# Security - -The [security team](https://codeberg.org/org/forgejo/teams/security) handle security vulnerabilities. It handles sensitive security-related issues reported to [security@forgejo.org](mailto:security@forgejo.org) using [encryption](https://keyoxide.org/security@forgejo.org). - -The security team also keeps the content of the [security.txt](https://codeberg.org/forgejo/website/src/branch/main/public/.well-known/security.txt) file up to date. - -The private GPG key for `security@forgejo.org` is shared among all members of the security team and not stored online.