From d11b2bb8e5bea6f29f82a20815ef7bf3fa96a0a2 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Thu, 30 Dec 2021 18:53:52 +0100 Subject: [PATCH] Mention Matrix Space & Rooms in Readme & Docs (#646) * Mention Matrix Space & Rooms in Readme & Docs * custom labels Co-authored-by: John Olheiser Co-authored-by: John Olheiser --- CONTRIBUTING.md | 2 +- README.md | 5 ++++- docs/docs/30-administration/20-vcs/50-bitbucket.md | 3 ++- docs/docusaurus.config.js | 4 ++++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a7c4e8778..daa2cd0d9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -5,7 +5,7 @@ To make sure every Pull Request (PR) is checked, we have **team maintainers**. Every PR **MUST** be reviewed by at least **one** maintainer (or owner) before it can get merged. A maintainer should be a contributor and contributed at least 4 accepted PRs. -A contributor should apply as a maintainer in the [Discord #develop](https://discord.gg/fcMQqSMXJy) channel. +A contributor should apply as a maintainer in the [Discord #develop](https://discord.gg/fcMQqSMXJy) or [Matrix Develop](https://matrix.to/#/#WoodpeckerCI-Develop:obermui.de) channel. The owners or the team maintainers may invite the contributor. A maintainer should spend some time on code reviews. diff --git a/README.md b/README.md index dd75da51a..15dfc4f56 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,10 @@ - + + + + diff --git a/docs/docs/30-administration/20-vcs/50-bitbucket.md b/docs/docs/30-administration/20-vcs/50-bitbucket.md index 1f073a857..be013b061 100644 --- a/docs/docs/30-administration/20-vcs/50-bitbucket.md +++ b/docs/docs/30-administration/20-vcs/50-bitbucket.md @@ -53,4 +53,5 @@ WOODPECKER_BITBUCKET_SECRET=... # Bitbucket oauth2 client secret ## Missing Features -Merge requests are not currently supported. We are interested in patches to include this functionality. If you are interested in contributing to Woodpecker and submitting a patch please [contact us](https://discord.gg/fcMQqSMXJy). +Merge requests are not currently supported. We are interested in patches to include this functionality. +If you are interested in contributing to Woodpecker and submitting a patch please **contact us** via [Discord](https://discord.gg/fcMQqSMXJy) or [Matrix](https://matrix.to/#/#WoodpeckerCI-Develop:obermui.de). diff --git a/docs/docusaurus.config.js b/docs/docusaurus.config.js index c247aec0a..741e43431 100644 --- a/docs/docusaurus.config.js +++ b/docs/docusaurus.config.js @@ -86,6 +86,10 @@ module.exports = { label: 'Discord', href: 'https://discord.gg/fcMQqSMXJy', }, + { + label: 'Matrix', + href: 'https://matrix.to/#/#woodpecker:matrix.org', + }, { label: 'Mastodon', href: 'https://mastodon.technology/@WoodpeckerCI',