diff --git a/.github/issue_template.md b/.github/issue_template.md index 59df56a..90ed815 100644 --- a/.github/issue_template.md +++ b/.github/issue_template.md @@ -1,5 +1,5 @@ 1. Please speak English, this is the language which all of us can speak and write. -2. Please ask questions or configuration/deploy problems on our Gitter channel: https://gitter.im/go-gitea/gitea +2. Please ask questions or configuration/deploy problems on our Discord server: https://discord.gg/NsatcWJ 3. Please take a moment to search check that your issue doesn't already exist. 4. Please give all relevant information below for bug reports, because incomplete details will be handled as an invalid report. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2823bfc..83fe834 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -48,13 +48,13 @@ Please use your real name, we really dislike pseudonyms or anonymous contributio ## Maintainers -To make sure every PR is checked, we have [team maintainers](https://github.com/orgs/go-gitea/teams/maintainers). Every PR **MUST** be reviewed by at least two maintainers (or owners) before it can get merged. A maintainer should be a contributor of Gitea (or Gogs) and contributed at least 4 accepted PRs. A contributor should apply as a maintainer in the [Gitter develop channel](https://gitter.im/go-gitea/develop). The owners or the team maintainers may invite the contributor. A maintainer should spend some time on code reviews. If a maintainer has no time to do that, they should apply to leave the maintainers team and we will give them the honor of being a member of the [advisors team](https://github.com/orgs/go-gitea/teams/advisors). Of course, if an advisor has time to code review, we will gladly welcome them back to the maintainers team. If a maintainer is inactive for more than 3 months and forgets to leave the maintainers team, the owners may move him or her from the maintainers team to the advisors team. +To make sure every PR is checked, we have [team maintainers](https://github.com/orgs/go-gitea/teams/maintainers). Every PR **MUST** be reviewed by at least two maintainers (or owners) before it can get merged. A maintainer should be a contributor of Gitea (or Gogs) and contributed at least 4 accepted PRs. A contributor should apply as a maintainer in the [Discord #develop channel](https://discord.gg/NsatcWJ). The owners or the team maintainers may invite the contributor. A maintainer should spend some time on code reviews. If a maintainer has no time to do that, they should apply to leave the maintainers team and we will give them the honor of being a member of the [advisors team](https://github.com/orgs/go-gitea/teams/advisors). Of course, if an advisor has time to code review, we will gladly welcome them back to the maintainers team. If a maintainer is inactive for more than 3 months and forgets to leave the maintainers team, the owners may move him or her from the maintainers team to the advisors team. ## Owners Since Gitea is a pure community organization without any company support, to keep the development healthy we will elect three owners every year. All contributors may vote to elect up to three candidates, one of which will be the main owner, and the other two the assistant owners. When the new owners have been elected, the old owners will give up ownership to the newly elected owners. If an owner is unable to do so, the other owners will assist in ceding ownership to the newly elected owners. -After the election, the new owners should proactively agree with our [CONTRIBUTING](CONTRIBUTING.md) requirements on the [Gitter main channel](https://gitter.im/go-gitea/gitea). Below are the words to speak: +After the election, the new owners should proactively agree with our [CONTRIBUTING](CONTRIBUTING.md) requirements on the [Discord #general channel](https://discord.gg/NsatcWJ). Below are the words to speak: ``` I'm honored to having been elected an owner of Gitea, I agree with [CONTRIBUTING](CONTRIBUTING.md). I will spend part of my time on Gitea and lead the development of Gitea. diff --git a/content/doc/help/seek-help.zh-cn.md b/content/doc/help/seek-help.zh-cn.md index a2a2747..ac62b9b 100644 --- a/content/doc/help/seek-help.zh-cn.md +++ b/content/doc/help/seek-help.zh-cn.md @@ -19,5 +19,5 @@ menu: - 到[Github issue](https://github.com/go-gitea/gitea/issues)提问(因为项目维护人员来自世界各地，为保证沟通顺畅，请使用英文提问) - 中文问题到[gocn.io](https://gocn.io/topic/Gitea)提问 -- 访问 [Gitter channel - 英文](https://gitter.im/go-gitea/gitea/) +- 访问 [Discord server - 英文](https://discord.gg/NsatcWJ) - 加入 QQ群 328432459 获得进一步的支持 diff --git a/content/doc/installation/from-binary.en-us.md b/content/doc/installation/from-binary.en-us.md index ffda928..c89486b 100644 --- a/content/doc/installation/from-binary.en-us.md +++ b/content/doc/installation/from-binary.en-us.md @@ -36,4 +36,4 @@ Older Linux distributions (such as Debian 7 and CentOS 6) may not be able to loa ## Anything missing? -Are we missing anything on this page? Then feel free to reach out to us on our [Gitter channel](https://gitter.im/go-gitea/gitea/), there you will get answers to any question pretty fast. +Are we missing anything on this page? Then feel free to reach out to us on our [Discord server](https://discord.gg/NsatcWJ), there you will get answers to any question pretty fast. diff --git a/content/doc/installation/from-binary.zh-tw.md b/content/doc/installation/from-binary.zh-tw.md index c1fa780..e6b4637 100644 --- a/content/doc/installation/from-binary.zh-tw.md +++ b/content/doc/installation/from-binary.zh-tw.md @@ -32,4 +32,4 @@ chmod +x gitea ## 需要協助？ -如果本頁中無法解決您的問題，請直接到 [Gitter channel](https://gitter.im/go-gitea/gitea/)，在那邊可以快速得到協助。 +如果本頁中無法解決您的問題，請直接到 [Discord server](https://discord.gg/NsatcWJ)，在那邊可以快速得到協助。 diff --git a/content/doc/installation/from-package.en-us.md b/content/doc/installation/from-package.en-us.md index b6268b8..94f0815 100644 --- a/content/doc/installation/from-package.en-us.md +++ b/content/doc/installation/from-package.en-us.md @@ -54,4 +54,4 @@ To enable Gitea to run as a service, run `sysrc gitea_enable=YES` and start it w ## Anything missing? -Are we missing anything on this page? Then feel free to reach out to us on our [Gitter channel](https://gitter.im/go-gitea/gitea/), there you will get answers to any question pretty fast. +Are we missing anything on this page? Then feel free to reach out to us on our [Discord server](https://discord.gg/NsatcWJ), there you will get answers to any question pretty fast. diff --git a/content/doc/installation/from-package.zh-tw.md b/content/doc/installation/from-package.zh-tw.md index 433a8c3..f37579d 100644 --- a/content/doc/installation/from-package.zh-tw.md +++ b/content/doc/installation/from-package.zh-tw.md @@ -50,4 +50,4 @@ make install clean ## 需要協助？ -如果本頁中無法解決您的問題，請直接到 [Gitter channel](https://gitter.im/go-gitea/gitea/)，在那邊可以快速得到協助。 +如果本頁中無法解決您的問題，請直接到 [Discord server](https://discord.gg/NsatcWJ)，在那邊可以快速得到協助。 diff --git a/content/doc/installation/from-source.en-us.md b/content/doc/installation/from-source.en-us.md index fe6b3db..a4643f0 100644 --- a/content/doc/installation/from-source.en-us.md +++ b/content/doc/installation/from-source.en-us.md @@ -76,4 +76,4 @@ After following the steps above you will have a `gitea` binary within your worki ## Anything missing? -Are we missing anything on this page? Then feel free to reach out to us on our [Gitter channel](https://gitter.im/go-gitea/gitea/), there you will get answers to any question pretty fast. +Are we missing anything on this page? Then feel free to reach out to us on our [Discord server](https://discord.gg/NsatcWJ), there you will get answers to any question pretty fast. diff --git a/content/doc/installation/from-source.zh-tw.md b/content/doc/installation/from-source.zh-tw.md index 0ba0ac5..9fdb9cc 100644 --- a/content/doc/installation/from-source.zh-tw.md +++ b/content/doc/installation/from-source.zh-tw.md @@ -69,5 +69,5 @@ TAGS="bindata" make generate build ## 需要協助？ -如果本頁中無法解決您的問題，請直接到 [Gitter channel](https://gitter.im/go-gitea/gitea/)，在那邊可以快速得到協助。 +如果本頁中無法解決您的問題，請直接到 [Discord server](https://discord.gg/NsatcWJ)，在那邊可以快速得到協助。 diff --git a/content/doc/installation/with-docker.en-us.md b/content/doc/installation/with-docker.en-us.md index 89b8431..4227f96 100644 --- a/content/doc/installation/with-docker.en-us.md +++ b/content/doc/installation/with-docker.en-us.md @@ -101,4 +101,4 @@ You should now have two Docker containers for Gitea and PostgreSQL plus two Dock # Anything missing? -Are we missing anything on this page? Then feel free to reach out to us on our [Gitter channel](https://gitter.im/go-gitea/gitea/), there you will get answers to any question pretty fast. +Are we missing anything on this page? Then feel free to reach out to us on our [Discord server](https://discord.gg/NsatcWJ), there you will get answers to any question pretty fast. diff --git a/content/doc/installation/with-docker.zh-tw.md b/content/doc/installation/with-docker.zh-tw.md index c5138fc..960c231 100644 --- a/content/doc/installation/with-docker.zh-tw.md +++ b/content/doc/installation/with-docker.zh-tw.md @@ -37,4 +37,4 @@ docker run -d --name=gitea -p 10022:22 -p 10080:3000 -v /var/lib/gitea:/data git ## 需要協助？ -如果本頁中無法解決您的問題，請直接到 [Gitter channel](https://gitter.im/go-gitea/gitea/)，在那邊可以快速得到協助。 +如果本頁中無法解決您的問題，請直接到 [Discord server](https://discord.gg/NsatcWJ)，在那邊可以快速得到協助。