Merge explicit-is-better-than-implicit-8173: Adopt a Code of Conduct

Author: hawkowl Reviewers: adiroiban, glyph Special Thanks: moshez Fixes: twisted#8173 git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@46635 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
yssource · Jan 21, 2016 · 2043394 · 2043394
1 parent ca9c624
commit 2043394
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 0 deletions.
diff --git a/CONTRIBUTING b/CONTRIBUTING
@@ -13,6 +13,8 @@ Extensive contribution guidelines are available online at:
 
 https://twistedmatrix.com/trac/wiki/ContributingToTwistedLabs
 
+Twisted has a Code of Conduct, available at code_of_conduct.md.
+
 **Warning: pull requests are ignored!** File a ticket at:
 
 https://twistedmatrix.com/trac/newticket

diff --git a/code_of_conduct.md b/code_of_conduct.md
@@ -0,0 +1,58 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, and in the interest of
+fostering an open and welcoming community, we pledge to respect all people who
+contribute through reporting issues, posting feature requests, updating
+documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free
+experience for everyone, regardless of level of experience, gender, gender
+identity and expression, sexual orientation, disability, personal appearance,
+body size, race, ethnicity, age, religion, or nationality.
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery
+* Personal attacks
+* Trolling or insulting/derogatory comments
+* Public or private harassment
+* Publishing other's private information, such as physical or electronic
+  addresses, without explicit permission
+* Other unethical or unprofessional conduct
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+By adopting this Code of Conduct, project maintainers commit themselves to
+fairly and consistently applying these principles to every aspect of managing
+this project. Project maintainers who do not follow or enforce the Code of
+Conduct may be permanently removed from the project team.
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting a project maintainer (see below). All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. Maintainers are
+obligated to maintain confidentiality with regard to the reporter of an
+incident.
+
+You may send reports to [our Conduct email](mailto:conduct@twistedmatrix.com).
+
+If you wish to contact specific maintainers directly, the following have made
+themselves available for conduct issues:
+
+- Amber Brown (HawkOwl) (hawkowl at twistedmatrix.com)
+- Moshe Zadka (zadka.moshe at gmail.com)
+
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 1.3.0, available at
+[http://contributor-covenant.org/version/1/3/0/][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/3/0/
diff --git a/twisted/topfiles/8173.doc b/twisted/topfiles/8173.doc
@@ -0,0 +1 @@
+The Twisted Project has adopted the Contributor Covenant as its Code of Conduct.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		The Twisted Project has adopted the Contributor Covenant as its Code of Conduct.