Skip to content

Adding Code of Conduct #9394

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 8 commits into from
Apr 30, 2018
Merged

Adding Code of Conduct #9394

Changes from 1 commit
Commits
Show all changes
8 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
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
Next Next commit
Change "race" to "ethnic origin"
  • Loading branch information
@egircys @fabpot
egircys authored and fabpot committed Apr 30, 2018
commit 2f8aa5d19f9d4214167d893b42eeb96dbaad8412
2 changes: 1 addition & 1 deletion contributing/code_of_conduct/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ 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,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After the last change, ethnicity and ethnic origin are used in the same paragraph. We should remove ethnicity and keep just ethnic origin.

education, socio-economic status, nationality, personal appearance, race,
education, socio-economic status, nationality, personal appearance, ethnic origin,
religion, or sexual identity and orientation.

Our Standards
Expand Down