Skip to content

Commit

Permalink
Updated website with about section (zio#1644)
Browse files Browse the repository at this point in the history
* Updated website with about section

* Update to make committee members a list and use relative links for file links in readme

* added file links to CoC and Contributing guide
  • Loading branch information
softinio committed Sep 12, 2019
1 parent b99b0b0 commit 83a0c87
Show file tree
Hide file tree
Showing 8 changed files with 355 additions and 329 deletions.
42 changes: 0 additions & 42 deletions CODE_OF_CONDUCT.md

This file was deleted.

1 change: 1 addition & 0 deletions CODE_OF_CONDUCT.md
285 changes: 0 additions & 285 deletions CONTRIBUTING.md

This file was deleted.

1 change: 1 addition & 0 deletions CONTRIBUTING.md
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Powered by highly-scalable, non-blocking fibers that never waste or leak resourc
To learn more about ZIO, see the following references:

- [Homepage](https://zio.dev/)
- [Contributor's Guide](CONTRIBUTING.md)
- [Contributor's Guide](./docs/about/contributing.md)
- [License](LICENSE)
- [Issues](https://github.com/zio/zio/issues)
- [Pull Requests](https://github.com/zio/zio/pulls)
Expand All @@ -47,7 +47,7 @@ To learn more about ZIO, see the following references:

## Code of Conduct

See the [Code of Conduct](CODE_OF_CONDUCT.md)
See the [Code of Conduct](./docs/about/code_of_conduct.md)

---

Expand Down
46 changes: 46 additions & 0 deletions docs/about/code_of_conduct.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
---
id: about_coc
title: "ZIO Code of Conduct"
---

We are committed to providing a friendly, safe and welcoming
environment for all, regardless of level of experience, gender, gender
identity and expression, sexual orientation, disability, personal
appearance, body size, race, ethnicity, age, religion, nationality, or
other such characteristics.

The ZIO project follows the [Scala Code of Conduct](https://www.scala-lang.org/conduct/), with
an additional clause regarding moderation that is detailed below. All participants, contributors and
members are expected to follow the Scala Code of Conduct when discussing the project on the available
communication channels. If you are being harassed, please contact us immediately so that we can support you.

## Moderation and Steering Committee

The ZIO project is moderated by the Steering Committee team members:

- Itamar Ravid [@iravid](https://github.com/iravid)
- John De Goes [@jdegoes](https://github.com/jdegoes)
- Kai [@neko-kai](https://github.com/neko-kai)
- Paul Shirshov [@pshirshov](https://github.com/pshirshov)
- Pierre Ricadat [@ghostdogpr](https://github.com/ghostdogpr)
- Salar Rahmanian [@softinio](https://github.com/softinio)
- Wiem Zine El Abidine [@wi101](https://github.com/wi101)

The ZIO project requires that drastic moderation actions detailed in the code of
conduct - for example, removing a user from the Gitter channel - be agreed upon
a group of over 2/3rds of the steering committee.

For any questions, concerns, or moderation requests please contact any member of
the project, or the people listed above.

## BDFL

In addition to the above, the ZIO project's BDFL (benevolent dictator for life) is
John De Goes (@jdegoes), owing to his original founding of the project and continued
investments in it. While John adheres to the same code of conduct as everyone else,
he is entitled to override moderation decisions made by the steering committee.

We do not take the BDFL position lightly, especially with regards to moderation. John
has consistently shown he is level-headed and able to handle conflict responsibly. Feel
free to reach out to any member of the steering committee, including John himself,
with any concern you might have.
Loading

0 comments on commit 83a0c87

Please sign in to comment.