Skip to content

Commit 65b1f8b

Browse files
authored
🤖 Sync org-wide files to upstream repo (#60)
More info: exercism/org-wide-files@ceface8
1 parent 1be0366 commit 65b1f8b

File tree

2 files changed

+39
-28
lines changed

2 files changed

+39
-28
lines changed

‎.github/labels.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -157,16 +157,16 @@
157157
description: "Work on Documentation"
158158
color: "ffffff"
159159

160-
# This label can be added to accept PRs as part of Hacktoberfest
161-
- name: "hacktoberfest-accepted"
162-
description: "Make this PR count for hacktoberfest"
163-
color: "ff7518"
164-
165160
# This Exercism-wide label is added to all automatically created pull requests that help migrate/prepare a track for Exercism v3
166161
- name: "v3-migration 🤖"
167162
description: "Preparing for Exercism v3"
168163
color: "e99695"
169164

165+
# This Exercism-wide label can be used to bulk-close issues in preparation for pausing community contributions
166+
- name: "paused"
167+
description: "Work paused until further notice"
168+
color: "e4e669"
169+
170170
# ----------------------------------------------------------------------------------------- #
171171
# These are the repository-specific labels that augment the Exercise-wide labels defined in #
172172
# https://github.com/exercism/org-wide-files/blob/main/global-files/.github/labels.yml. #

‎CODE_OF_CONDUCT.md

+34-23
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,23 @@
22

33
## Introduction
44

5-
Exercism is a platform centered around empathetic conversation. We have a low tolerance for communication that makes anyone feel unwelcome, unsupported, insulted or discriminated against.
5+
Exercism is a platform centered around empathetic conversation.
6+
We have a low tolerance for communication that makes anyone feel unwelcome, unsupported, insulted or discriminated against.
67

78
## Seen or experienced something uncomfortable?
89

9-
If you see or experience abuse, harassment, discrimination, or feel unsafe or upset, please email [[email protected]](mailto:[email protected]?subject=%5BCoC%5D) and include \[CoC\] in the subject line. We will follow up with you as a priority.
10+
If you see or experience abuse, harassment, discrimination, or feel unsafe or upset, please email [[email protected]](mailto:[email protected]?subject=%5BCoC%5D) and include \[CoC\] in the subject line.
11+
We will follow up with you as a priority.
1012

1113
## Enforcement
1214

13-
We actively monitor for Code of Conduct (CoC) violations and take any reports of violations extremely seriously. We have banned contributors, mentors and users due to violations.
15+
We actively monitor for Code of Conduct (CoC) violations and take any reports of violations extremely seriously.
16+
We have banned contributors, mentors and users due to violations.
1417

15-
After we receive a report of a CoC violation, we view that person's conversation history on Exercism and related communication channels and attempt to understand whether someone has deliberately broken the CoC, or accidentally crossed a line. We generally reach out to the person who has been reported to discuss any concerns we have and warn them that repeated violations will result in a ban. Sometimes we decide that no violation has occurred and that no action is required and sometimes we will also ban people on a first offense. We strive to be fair, but will err on the side of protecting the culture of our community.
18+
After we receive a report of a CoC violation, we view that person's conversation history on Exercism and related communication channels and attempt to understand whether someone has deliberately broken the CoC, or accidentally crossed a line.
19+
We generally reach out to the person who has been reported to discuss any concerns we have and warn them that repeated violations will result in a ban.
20+
Sometimes we decide that no violation has occurred and that no action is required and sometimes we will also ban people on a first offense.
21+
We strive to be fair, but will err on the side of protecting the culture of our community.
1622

1723
Exercism's leadership reserve the right to take whatever action they feel appropriate with regards to CoC violations.
1824

@@ -36,15 +42,16 @@ Exercism should be a safe place for everybody regardless of
3642
- Race
3743
- Age
3844
- Religion
39-
- Anything else you can think of.
45+
- Anything else you can think of
4046

4147
As someone who is part of this community, you agree that:
4248

43-
- We are collectively and individually committed to safety and inclusivity.
44-
- We have zero tolerance for abuse, harassment, or discrimination.
45-
- We respect people’s boundaries and identities.
46-
- We refrain from using language that can be considered offensive or oppressive (systemically or otherwise), eg. sexist, racist, homophobic, transphobic, ableist, classist, etc. - this includes (but is not limited to) various slurs.
47-
- We avoid using offensive topics as a form of humor.
49+
- We are collectively and individually committed to safety and inclusivity
50+
- We have zero tolerance for abuse, harassment, or discrimination
51+
- We respect people’s boundaries and identities
52+
- We refrain from using language that can be considered offensive or oppressive (systemically or otherwise), eg. sexist, racist, homophobic, transphobic, ableist, classist, etc.
53+
- this includes (but is not limited to) various slurs.
54+
- We avoid using offensive topics as a form of humor
4855

4956
We actively work towards:
5057

@@ -57,26 +64,30 @@ We condemn:
5764
- Stalking, doxxing, or publishing private information
5865
- Violence, threats of violence or violent language
5966
- Anything that compromises people’s safety
60-
- Conduct or speech which might be considered sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory or offensive in nature.
61-
- The use of unwelcome, suggestive, derogatory or inappropriate nicknames or terms.
62-
- Disrespect towards others (jokes, innuendo, dismissive attitudes) and towards differences of opinion.
63-
- Intimidation or harassment (online or in-person). Please read the [Citizen Code of Conduct](https://github.com/stumpsyn/policies/blob/master/citizen_code_of_conduct.md) for how we interpret harassment.
64-
- Inappropriate attention or contact.
65-
- Not understanding the differences between constructive criticism and disparagement.
67+
- Conduct or speech which might be considered sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory or offensive in nature
68+
- The use of unwelcome, suggestive, derogatory or inappropriate nicknames or terms
69+
- Disrespect towards others (jokes, innuendo, dismissive attitudes) and towards differences of opinion
70+
- Intimidation or harassment (online or in-person).
71+
Please read the [Citizen Code of Conduct](https://github.com/stumpsyn/policies/blob/master/citizen_code_of_conduct.md) for how we interpret harassment
72+
- Inappropriate attention or contact
73+
- Not understanding the differences between constructive criticism and disparagement
6674

6775
These things are NOT OK.
6876

69-
Be aware of how your actions affect others. If it makes someone uncomfortable, stop.
77+
Be aware of how your actions affect others.
78+
If it makes someone uncomfortable, stop.
7079

7180
If you say something that is found offensive, and you are called out on it, try to:
7281

73-
- Listen without interruption.
74-
- Believe what the person is saying & do not attempt to disqualify what they have to say.
75-
- Ask for tips / help with avoiding making the offense in the future.
76-
- Apologize and ask forgiveness.
82+
- Listen without interruption
83+
- Believe what the person is saying & do not attempt to disqualify what they have to say
84+
- Ask for tips / help with avoiding making the offense in the future
85+
- Apologize and ask forgiveness
7786

7887
## History
7988

80-
This policy was initially adopted from the Front-end London Slack community and has been modified since. A version history can be seen on [GitHub](https://github.com/exercism/website-copy/edit/main/pages/code_of_conduct.md).
89+
This policy was initially adopted from the Front-end London Slack community and has been modified since.
90+
A version history can be seen on [GitHub](https://github.com/exercism/website-copy/edit/main/pages/code_of_conduct.md).
8191

82-
_This policy is a "living" document, and subject to refinement and expansion in the future. This policy applies to the Exercism website, the Exercism GitHub organization, any other Exercism-related communication channels (e.g. Slack, Twitter, email) and any other Exercism entity or event._
92+
_This policy is a "living" document, and subject to refinement and expansion in the future.
93+
This policy applies to the Exercism website, the Exercism GitHub organization, any other Exercism-related communication channels (e.g. Slack, Twitter, email) and any other Exercism entity or event._

0 commit comments

Comments
 (0)