Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Gitea Community Code of Conduct #23188

Merged
merged 9 commits into from
Mar 9, 2023
Merged

Add Gitea Community Code of Conduct #23188

merged 9 commits into from
Mar 9, 2023

Conversation

wolfogre
Copy link
Member

@wolfogre wolfogre commented Feb 28, 2023

The Gitea Community Code of Conduct.

Authored by lunny. Slightly modified from Go CoC


CC all TOCs:

@go-gitea/technical-oversight-committee

And we welcome suggestions from everyone.

@wolfogre wolfogre added the type/docs This PR mainly updates/creates documentation label Feb 28, 2023
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Feb 28, 2023
CODE_OF_CONDUCT.md Outdated Show resolved Hide resolved
CODE_OF_CONDUCT.md Show resolved Hide resolved
CODE_OF_CONDUCT.md Outdated Show resolved Hide resolved
CODE_OF_CONDUCT.md Outdated Show resolved Hide resolved
Co-authored-by: delvh <dev.lh@web.de>
@jolheiser
Copy link
Member

It should be noted at least in this PR that this CoC is based on the Go CoC.

Co-authored-by: delvh <dev.lh@web.de>
@delvh
Copy link
Member

delvh commented Mar 2, 2023

Ping.
This is a PR that should be merged rather earlier than later.

@wolfogre
Copy link
Member Author

wolfogre commented Mar 3, 2023

Need more help from other English native speakers.

@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Mar 3, 2023
CODE_OF_CONDUCT.md Outdated Show resolved Hide resolved
@jolheiser
Copy link
Member

For comparison, here is the diff of the current document (at time of comment) to the Go CoC.

Diff
diff --git a/go.md b/gitea.md
index 435bcc7..ef4151c 100644
--- a/go.md
+++ b/gitea.md
@@ -1,20 +1,20 @@
-# Go Community Code of Conduct
+# Gitea Community Code of Conduct
 
 ## About
 
-Online communities include people from many different backgrounds. The Go contributors are committed to providing a friendly, safe and welcoming environment for all, regardless of gender identity and expression, sexual orientation, disabilities, neurodiversity, physical appearance, body size, ethnicity, nationality, race, age, religion, or similar personal characteristics.
+Online communities include people from many different backgrounds. The Gitea contributors are committed to providing a friendly, safe and welcoming environment for all, regardless of gender identity and expression, sexual orientation, disabilities, neurodiversity, physical appearance, body size, ethnicity, nationality, race, age, religion, or similar personal characteristics.
 
-The first goal of the Code of Conduct is to specify a baseline standard of behavior so that people with different social values and communication styles can talk about Go effectively, productively, and respectfully.
+The first goal of the Code of Conduct is to specify a baseline standard of behavior so that people with different social values and communication styles can talk about Gitea effectively, productively, and respectfully.
 
 The second goal is to provide a mechanism for resolving conflicts in the community when they arise.
 
-The third goal of the Code of Conduct is to make our community welcoming to people from different backgrounds. Diversity is critical to the project; for Go to be successful, it needs contributors and users from all backgrounds. (See [Go, Open Source, Community](https://blog.golang.org/open-source).)
+The third goal of the Code of Conduct is to make our community welcoming to people from different backgrounds. Diversity is critical to the project; for Gitea to be successful, it needs contributors and users from all backgrounds.
 
 We believe that healthy debate and disagreement are essential to a healthy project and community. However, it is never ok to be disrespectful. We value diverse opinions, but we value respectful behavior more.
 
-## Gopher values
+## Community values
 
-These are the values to which people in the Go community (“Gophers”) should aspire.
+These are the values to which people in the Gitea community should aspire.
 
 - **Be friendly and welcoming.**
 - **Be patient.**
@@ -36,7 +36,7 @@ These are the values to which people in the Go community (“Gophers”) should
 - **Be responsible.**
   - What you say and do matters. Take responsibility for your words and actions, including their consequences, whether intended or otherwise.
 
-People are complicated. You should expect to be misunderstood and to misunderstand others; when this inevitably occurs, resist the urge to be defensive or assign blame. Try not to take offense where no offense was intended. Give people the benefit of the doubt. Even if the intent was to provoke, do not rise to it. It is the responsibility of _all parties_ to de-escalate conflict when it arises.
+People are complicated. You should expect to be misunderstood and to misunderstand others; when this inevitably occurs, resist the urge to be defensive or assign blame. Try not to take offense where no offense was intended. Give people the benefit of the doubt. Even if the intent was to provoke, do not rise to it. It is the responsibility of all parties to de-escalate conflict when it arises.
 
 ## Code of Conduct
 
@@ -80,17 +80,18 @@ We do not believe that all conflict is bad; healthy debate and disagreement ofte
 
 If you see someone violating the code of conduct, you are encouraged to address the behavior directly with those involved. Many issues can be resolved quickly and easily, and this gives people more control over the outcome of their dispute. If you are unable to resolve the matter for any reason, or if the behavior is threatening or harassing, report it. We are dedicated to providing an environment where participants feel welcome and safe.
 
-Reports should be directed to the Go Project Stewards at _conduct@golang.org_. It is the Project Stewards’ duty to receive and address reported violations of the code of conduct. They will then work with a committee consisting of representatives from the Open Source Programs Office and the Google Open Source Strategy team. If for any reason you are uncomfortable reaching out to the Project Stewards, please email the Google Open Source Programs Office at _opensource@google.com_.
+Reports should be directed to the Gitea Project Stewards at conduct@gitea.com. It is the Project Stewards’ duty to receive and address reported violations of the code of conduct. They will then work with a committee consisting of representatives from the technical-oversight-committee.
 
 We will investigate every complaint, but you may not receive a direct response. We will use our discretion in determining when and how to follow up on reported incidents, which may range from not taking action to permanent expulsion from the project and project-sponsored spaces. We will notify the accused of the report and provide them an opportunity to discuss it before any action is taken. The identity of the reporter will be omitted from the details of the report supplied to the accused. In potentially harmful situations, such as ongoing harassment or threats to anyone’s safety, we may take action without notice.
 
 ### Attribution
 
-This Code of Conduct is adapted from the Contributor Covenant, version 1.4, available at [https://www.contributor-covenant.org/version/1/4/code-of-conduct.html](https://www.contributor-covenant.org/version/1/4/code-of-conduct.html)
+This Code of Conduct is adapted from the Contributor Covenant, version 1.4, available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
 
 ## Summary
 
 - Treat everyone with respect and kindness.
 - Be thoughtful in how you communicate.
 - Don’t be destructive or inflammatory.
-- If you encounter an issue, please mail [conduct@golang.org](mailto:conduct@golang.org).
+- If you encounter an issue, please mail conduct@gitea.com.
+

It's not much different aside from Go -> Gitea, which I think is fine considering the point is to work from a solid base.

One thing that may be important to note or act upon is the question of "what if someone has a problem with a TOC member?".
The wording is a bit vague regarding who conduct@ is composed of. Is it a new group?
In the Go CoC there is an alternative email given, however we don't exactly have the same form of governance. Perhaps we need wording that such reports can be made to any given TOC member, in case a report to coduct@ would also include someone within that group?

wolfogre and others added 2 commits March 7, 2023 10:01
Co-authored-by: Nick <nick@kousu.ca>
Co-authored-by: delvh <dev.lh@web.de>
@lunny
Copy link
Member

lunny commented Mar 7, 2023

For comparison, here is the diff of the current document (at time of comment) to the Go CoC.
Diff

diff --git a/go.md b/gitea.md
index 435bcc7..ef4151c 100644
--- a/go.md
+++ b/gitea.md
@@ -1,20 +1,20 @@
-# Go Community Code of Conduct
+# Gitea Community Code of Conduct
 
 ## About
 
-Online communities include people from many different backgrounds. The Go contributors are committed to providing a friendly, safe and welcoming environment for all, regardless of gender identity and expression, sexual orientation, disabilities, neurodiversity, physical appearance, body size, ethnicity, nationality, race, age, religion, or similar personal characteristics.
+Online communities include people from many different backgrounds. The Gitea contributors are committed to providing a friendly, safe and welcoming environment for all, regardless of gender identity and expression, sexual orientation, disabilities, neurodiversity, physical appearance, body size, ethnicity, nationality, race, age, religion, or similar personal characteristics.
 
-The first goal of the Code of Conduct is to specify a baseline standard of behavior so that people with different social values and communication styles can talk about Go effectively, productively, and respectfully.
+The first goal of the Code of Conduct is to specify a baseline standard of behavior so that people with different social values and communication styles can talk about Gitea effectively, productively, and respectfully.
 
 The second goal is to provide a mechanism for resolving conflicts in the community when they arise.
 
-The third goal of the Code of Conduct is to make our community welcoming to people from different backgrounds. Diversity is critical to the project; for Go to be successful, it needs contributors and users from all backgrounds. (See [Go, Open Source, Community](https://blog.golang.org/open-source).)
+The third goal of the Code of Conduct is to make our community welcoming to people from different backgrounds. Diversity is critical to the project; for Gitea to be successful, it needs contributors and users from all backgrounds.
 
 We believe that healthy debate and disagreement are essential to a healthy project and community. However, it is never ok to be disrespectful. We value diverse opinions, but we value respectful behavior more.
 
-## Gopher values
+## Community values
 
-These are the values to which people in the Go community (“Gophers”) should aspire.
+These are the values to which people in the Gitea community should aspire.
 
 - **Be friendly and welcoming.**
 - **Be patient.**
@@ -36,7 +36,7 @@ These are the values to which people in the Go community (“Gophers”) should
 - **Be responsible.**
   - What you say and do matters. Take responsibility for your words and actions, including their consequences, whether intended or otherwise.
 
-People are complicated. You should expect to be misunderstood and to misunderstand others; when this inevitably occurs, resist the urge to be defensive or assign blame. Try not to take offense where no offense was intended. Give people the benefit of the doubt. Even if the intent was to provoke, do not rise to it. It is the responsibility of _all parties_ to de-escalate conflict when it arises.
+People are complicated. You should expect to be misunderstood and to misunderstand others; when this inevitably occurs, resist the urge to be defensive or assign blame. Try not to take offense where no offense was intended. Give people the benefit of the doubt. Even if the intent was to provoke, do not rise to it. It is the responsibility of all parties to de-escalate conflict when it arises.
 
 ## Code of Conduct
 
@@ -80,17 +80,18 @@ We do not believe that all conflict is bad; healthy debate and disagreement ofte
 
 If you see someone violating the code of conduct, you are encouraged to address the behavior directly with those involved. Many issues can be resolved quickly and easily, and this gives people more control over the outcome of their dispute. If you are unable to resolve the matter for any reason, or if the behavior is threatening or harassing, report it. We are dedicated to providing an environment where participants feel welcome and safe.
 
-Reports should be directed to the Go Project Stewards at _conduct@golang.org_. It is the Project Stewards’ duty to receive and address reported violations of the code of conduct. They will then work with a committee consisting of representatives from the Open Source Programs Office and the Google Open Source Strategy team. If for any reason you are uncomfortable reaching out to the Project Stewards, please email the Google Open Source Programs Office at _opensource@google.com_.
+Reports should be directed to the Gitea Project Stewards at conduct@gitea.com. It is the Project Stewards’ duty to receive and address reported violations of the code of conduct. They will then work with a committee consisting of representatives from the technical-oversight-committee.
 
 We will investigate every complaint, but you may not receive a direct response. We will use our discretion in determining when and how to follow up on reported incidents, which may range from not taking action to permanent expulsion from the project and project-sponsored spaces. We will notify the accused of the report and provide them an opportunity to discuss it before any action is taken. The identity of the reporter will be omitted from the details of the report supplied to the accused. In potentially harmful situations, such as ongoing harassment or threats to anyone’s safety, we may take action without notice.
 
 ### Attribution
 
-This Code of Conduct is adapted from the Contributor Covenant, version 1.4, available at [https://www.contributor-covenant.org/version/1/4/code-of-conduct.html](https://www.contributor-covenant.org/version/1/4/code-of-conduct.html)
+This Code of Conduct is adapted from the Contributor Covenant, version 1.4, available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
 
 ## Summary
 
 - Treat everyone with respect and kindness.
 - Be thoughtful in how you communicate.
 - Don’t be destructive or inflammatory.
-- If you encounter an issue, please mail [conduct@golang.org](mailto:conduct@golang.org).
+- If you encounter an issue, please mail conduct@gitea.com.
+

It's not much different aside from Go -> Gitea, which I think is fine considering the point is to work from a solid base.

One thing that may be important to note or act upon is the question of "what if someone has a problem with a TOC member?". The wording is a bit vague regarding who conduct@ is composed of. Is it a new group? In the Go CoC there is an alternative email given, however we don't exactly have the same form of governance. Perhaps we need wording that such reports can be made to any given TOC member, in case a report to coduct@ would also include someone within that group?

The email address is a mail list will be forwarded to all members of TOC. I think it's OK to send an email to it so that every TOC member will receive it.

@codecov-commenter

This comment was marked as off-topic.

@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Mar 7, 2023
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 9, 2023
@lunny lunny merged commit 8cadd51 into go-gitea:main Mar 9, 2023
@lunny lunny removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 9, 2023
zjjhot added a commit to zjjhot/gitea that referenced this pull request Mar 10, 2023
* giteaofficial/main:
  Improve squash merge commit author and co-author with private emails (go-gitea#22977)
  Fix broken Chroma CSS styles (go-gitea#23174)
  Add gradle samples in maven doc of packages (go-gitea#23374)
  Fix and move "Use this template" button (go-gitea#23398)
  [skip ci] Updated translations via Crowdin
  Add init file for Ubuntu (go-gitea#23362)
  Rename `canWriteUnit` to `canWriteProjects` (go-gitea#23386)
  Fix pull request update showing too many commits with multiple branches (go-gitea#22856)
  Fix incorrect NotFound conditions in org/projects.go (go-gitea#23384)
  Refactor merge/update git command calls (go-gitea#23366)
  Redirect to project again after editing it (go-gitea#23326)
  Add Gitea Community Code of Conduct (go-gitea#23188)
@delvh delvh added this to the 1.20.0 milestone Apr 3, 2023
@go-gitea go-gitea locked and limited conversation to collaborators May 3, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/docs This PR mainly updates/creates documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants