Skip to content

Added concrete example document #9393

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.

Sign up for GitHub

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

Merged
merged 13 commits into from
Apr 30, 2018
Merged

Added concrete example document #9393

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
eba3ecf
Adding Code of Conduct
egircys Mar 4, 2018
464ea45
add link to examples document
egircys Mar 5, 2018
1b0e633
Change "project's leadership" to "core team"
egircys Mar 6, 2018
2f8aa5d
Change "race" to "ethnic origin"
egircys Mar 7, 2018
e61a403
Replace ethnicity with ethnic origin
egircys Mar 7, 2018
0e7b539
add link to core team
Apr 20, 2018
2de768f
change project team to enforcement team
Apr 20, 2018
02e4860
update contributor covenant link & documents fix
Apr 20, 2018
33b0d9b
feature #9394 Adding Code of Conduct (egircys)
fabpot Apr 30, 2018
7911a86
Added concrete example document
michellesanver Mar 5, 2018
201738f
Updated to say that some jokes are not ok
michellesanver Apr 17, 2018
c762418
Syntax
michellesanver Apr 17, 2018
cccf869
Update concrete_example_document.rst
michellesanver Apr 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Update concrete_example_document.rst
  • Loading branch information
@michellesanver @fabpot
michellesanver authored and fabpot committed Apr 30, 2018
commit cccf8694575d6265bcf1e888c1ad4315fa7c4d9c
2 changes: 1 addition & 1 deletion contributing/code_of_conduct/concrete_example_document.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Concrete Examples
* Threats of violence like "The person that created this PR should be
punched in the face";
* Incitement of violence towards any individual, including encouraging a
person to commit suicide or to engage in self-harm (even as a joke).
person to commit suicide or to engage in self-harm (even as a joke);
* Sustained disruption of discussion;
* Pattern of inappropriate social contact, such as requesting/assuming
inappropriate levels of intimacy with others;
Expand Down