From 3caed9b627e167f5a9b46574f544ae7e294e71c9 Mon Sep 17 00:00:00 2001 From: Myles Borins Date: Mon, 23 Oct 2017 19:34:04 -0400 Subject: [PATCH 1/3] meta: fix case of extensions on internal docs MD -> md --- CODE_OF_CONDUCT.MD => CODE_OF_CONDUCT.md | 0 MEMBER_TRAVEL_FUND.MD => MEMBER_TRAVEL_FUND.md | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename CODE_OF_CONDUCT.MD => CODE_OF_CONDUCT.md (100%) rename MEMBER_TRAVEL_FUND.MD => MEMBER_TRAVEL_FUND.md (100%) diff --git a/CODE_OF_CONDUCT.MD b/CODE_OF_CONDUCT.md similarity index 100% rename from CODE_OF_CONDUCT.MD rename to CODE_OF_CONDUCT.md diff --git a/MEMBER_TRAVEL_FUND.MD b/MEMBER_TRAVEL_FUND.md similarity index 100% rename from MEMBER_TRAVEL_FUND.MD rename to MEMBER_TRAVEL_FUND.md From 4f60d5350c416acea9bdd4009321691bdcb49bf3 Mon Sep 17 00:00:00 2001 From: Myles Borins Date: Mon, 23 Oct 2017 19:46:06 -0400 Subject: [PATCH 2/3] doc: move CoC from TSC repo --- CODE_OF_CONDUCT.md | 88 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 85 insertions(+), 3 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 6c0c58a9..8534048e 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,4 +1,86 @@ -# Code of Conduct +# Contributor Covenant Code of Conduct -The Administration uses the common Node.js code of conduct defined -here: https://github.com/nodejs/TSC/blob/master/CODE_OF_CONDUCT.md. +## Our Pledge + +In the interest of fostering an open and welcoming environment, we as +contributors and maintainers pledge to making participation in our project and +our community a harassment-free experience for everyone, regardless of age, body +size, disability, ethnicity, gender identity and expression, level of experience, +nationality, personal appearance, race, religion, or sexual identity and +orientation. + +## Our Standards + +Examples of behavior that contributes to creating a positive environment +include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or +advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic + address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable +behavior and are expected to take appropriate and fair corrective action in +response to any instances of unacceptable behavior. + +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. + +## Scope + +This Code of Conduct applies both within project spaces and in public spaces +when an individual is representing the project or its community. Examples of +representing a project or community include using an official project e-mail +address, posting via an official social media account, or acting as an appointed +representative at an online or offline event. Representation of a project may be +further defined and clarified by project maintainers. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported by contacting the project team at report@nodejs.org. All +complaints will be reviewed and investigated and will result in a response that +is deemed necessary and appropriate to the circumstances. The project team is +obligated to maintain confidentiality with regard to the reporter of an incident. +Further details of specific enforcement policies may be posted separately. + +Project maintainers who do not follow or enforce the Code of Conduct in good +faith may face temporary or permanent repercussions as determined by other +members of the project's leadership. + +To learn more about the process of how moderators enforce the Code of Conduct, +review the [Moderation Policy] and [Requesting Moderation]. + +[Moderation Policy]: https://github.com/nodejs/TSC/blob/master/Moderation-Policy.md#moderation-policy +[Requesting Moderation]: https://github.com/nodejs/TSC/blob/master/Moderation-Policy.md#requesting-moderation + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], +version 1.4, available at [http://contributor-covenant.org/version/1/4][version] + +## Appendix A: The report@nodejs.org Alias + +*Note*: At the current time, all email sent to the `report@nodejs.org` email +alias is copied to all members of the [Node.js TSC][]. + +[homepage]: http://contributor-covenant.org +[version]: http://contributor-covenant.org/version/1/4/ +[Node.js TSC]: https://github.com/nodejs/tsc#current-members From d8e57772381e7eaf4070a0d881848245dd0d3b47 Mon Sep 17 00:00:00 2001 From: Myles Borins Date: Mon, 23 Oct 2017 19:51:09 -0400 Subject: [PATCH 3/3] doc: update Moderation Policy to current TSC copy --- Moderation-Policy.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Moderation-Policy.md b/Moderation-Policy.md index 9d48acec..02c5fefa 100644 --- a/Moderation-Policy.md +++ b/Moderation-Policy.md @@ -164,14 +164,14 @@ a Post from Moderation. * Identify all changes made to the Post, and * Identify the steps previously taken to resolve the issue. * If the Moderation action included Banning, an indication of whether the Ban - is permanent or temporary is required, along with an issue posted to the + is temporary or indefinite is required, along with an issue posted to the moderation repository justifying the action. * Explanations of Moderation actions on Collaborator Posts must be provided in: * A new post within the original thread, or * A new issue within the private nodejs/moderation repository. * Any Collaborator habitually violating the Code of Conduct or this Moderation policy may be Banned temporarily or, in extreme cases, Removed and Banned - permanently. + indefinitely. ### Non-Collaborator Posts @@ -182,7 +182,7 @@ of the [Code of Conduct][]. * Explain the justification for Moderating the post, and * Identify all changes made to the Post. * If the Moderation action included Banning, an indication of whether the Ban - is permanent or temporary is required, along with a note justifying the + is temporary or indefinite is required, along with a note justifying the action. * If an explanation of a Moderation action for a non-Collaborator Post is provided, it should be provided in: @@ -190,12 +190,12 @@ of the [Code of Conduct][]. * A new post within the original thread, or * A new issue within the private nodejs/moderation repository. * Moderation of Posts authored by non-Collaborators may result in those - non-Collaborators being Banned temporarily or permanently from further + non-Collaborators being Banned temporarily or indefinitely from further participation in the Node.js GitHub organization. * In the case where a GitHub Account appears to have been created with no intention to collaborate in good faith, swift actions may be taken without - following the above procedures including: removing Posts, Banning permanently, - and reporting accounts to GitHub. + following the above procedures including: removing Posts, Banning + indefinitely, and reporting accounts to GitHub. Note that Moderating non-Collaborator posts can often lead to retaliation or escalation of inappropriate behavior by the individual whose post is being @@ -217,14 +217,14 @@ decision was made should be added to the moderation repository thread. ### Temporary and Indefinite Bans -An Indefinite Ban is set for an unspecified period of time and may only be -lifted for an individual through a simple majority vote of the the Moderation -Team. - A Temporary Ban is time limited, with the timeframe decided on by the Moderation Team at the time of issuing, depending on the severity of the issue. Recommended default options are 24-hour, 48-hour, and 7-day periods. +An Indefinite Ban is set for an unspecified period of time and may only be +lifted for an individual through a simple majority vote of the Moderation +Team. + ## Privacy of the nodejs/moderation Repository The nodejs/moderation Repository is used to discuss the potentially sensitive