Skip to content

Create CODE_OF_CONDUCT.md#1061

Merged
frangio merged 2 commits into
masterfrom
feat/add-code-of-conduct-1
Jul 5, 2018
Merged

Create CODE_OF_CONDUCT.md#1061
frangio merged 2 commits into
masterfrom
feat/add-code-of-conduct-1

Conversation

@shrugs

@shrugs shrugs commented Jul 4, 2018

Copy link
Copy Markdown
Contributor

Description

Adds the contributor covenant to our open source project!

@frangio

frangio commented Jul 4, 2018

Copy link
Copy Markdown
Contributor

Not sure why but this one is slightly different than the one found at the site. It's odd because it's the same version.

Can we use that one verbatim?

@shrugs

shrugs commented Jul 4, 2018

Copy link
Copy Markdown
Contributor Author

@frangio which parts stand out to you? I don't see it after a quick eyeball

@nventuro

nventuro commented Jul 4, 2018

Copy link
Copy Markdown
Contributor

@shrugs yours is missing this section:

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.

and says

regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.

instead of

regardless of age, body size, disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.

@shrugs

shrugs commented Jul 4, 2018

Copy link
Copy Markdown
Contributor Author

gotcha! I'll manually copy and paste the md file from the website instead of using github's interface

@frangio frangio left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thanks @shrugs!

@shrugs

shrugs commented Jul 4, 2018

Copy link
Copy Markdown
Contributor Author

is the merge button broken for y'all as well? all green but "required status must pass before merging"

@frangio

frangio commented Jul 5, 2018

Copy link
Copy Markdown
Contributor

Broken for me too 😢.

I'll force merge it.

@frangio frangio merged commit 4575a24 into master Jul 5, 2018
@frangio frangio deleted the feat/add-code-of-conduct-1 branch July 5, 2018 18:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants