Skip to content
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

Jump to bottom

Add an updated Code of Conduct #222

Merged
merged 4 commits into from
Sep 14, 2020
Merged

Add an updated Code of Conduct #222

merged 4 commits into from
Sep 14, 2020

Conversation

lehnberg
Copy link
Contributor

As per mimblewimble/grin-pm#309

This PR:

  1. Updates the code of conduct (CoC) to follow contributor covenant v2.0 with no significant changes in wording. (Previously the CoC was based on the one used by Rust Language, which in turn is based off contributor covenant v1.3.)
  2. Adds the CoC to the website at https://grin.mw/policies/code_of_conduct.
  3. Adds a link to the CoC in the footer, and groups it together with the link to /grin-security
  4. Adds a reference to the CoC and call to actions at the bottom of https://grin.mw/community

If merged:

  • Each repo in the /mimblewimble Github org will have its CODE_OF_CONDUCT.md updated to point to https://grin.mw/policies/code_of_conduct.
  • Keybase stickies and forum.grin.mw will be similarly updated.

Previews

Live website

https://lehnberg.net/site/policies/code_of_conduct

Screenshots

Code of conduct

Screenshot-2020-08-13-at-13-05-22

grin.mw/community

Screenshot-2020-08-13-at-13-07-06

Page footer

Screenshot-2020-08-13-at-13-08-17

@lehnberg
Add code_of_conduct.md
a3d76e3 
This updates the code of conduct to follow v2.0 of the contributor covenant (was 1.3).
@lehnberg
Add CoC to footer and edit design
a93de4e 
Security and coc is now in a new "Policies" section.
@lehnberg
Add CoC reference to community.md
5eab646 
This adds a section repeating the pledge of the code of conduct alongside buttons that link to it and to contact the moderators.
quentinlesceller
quentinlesceller approved these changes Aug 13, 2020
View reviewed changes
Copy link
Member

@quentinlesceller quentinlesceller left a comment

Choose a reason for hiding this comment

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

Looking good 👍

@Paouky
Copy link
Contributor

Paouky commented Aug 13, 2020

There's no space between Github and Policies on your live website.

@lehnberg
Copy link
Contributor Author

There's no space between Github and Policies on your live website.

There is on Safari and Chrome (macOS), but I see now that there is not on Firefox... what browser are you using?

@Paouky
Copy link
Contributor

Paouky commented Aug 13, 2020

There's no space between Github and Policies on your live website.

There is on Safari and Chrome (macOS), but I see now that there is not on Firefox... what browser are you using?

Indeed I use Firefox.

@antiochp
Copy link
Member

Looks great! 👍

@lehnberg
Copy link
Contributor Author

@Paouky I did some testing and to be honest, I have no idea what's causing this bug on Firefox, there's clearly a <br> tag in there.

The only mitigation I can think of now that doesn't have me chasing my tail for a few hours is to simply remove <strong>Policies</strong> altogether, so that on Google and Safari the links will appear with a break in-between them, and on Firefox it will be a single list of items that are all links.

Not sure that's much better than what we have right now. What do you think?

@Paouky
Copy link
Contributor

Paouky commented Aug 13, 2020

@lehnberg I actually prefer entirely removing Policies as you suggest. I don't like having the corporate-sounding word so visible. But perhaps that's just me, both options are OK (both aesthetically and content wise).

@lehnberg
Copy link
Contributor Author

Oki @Paouky done - have a look on the live preview. I'll keep this open for another few days in case there is some more feedback?

@lehnberg
Copy link
Contributor Author

lehnberg commented Sep 7, 2020

PSA: Proposing to merge this after tomorrow's governance meeting.

@lehnberg
Copy link
Contributor Author

Merging, as per https://github.com/mimblewimble/grin-pm/blob/master/notes/20200908-meeting-governance.md#decision-update-code-of-conduct

@lehnberg lehnberg merged commit ca6c472 into mimblewimble:master Sep 14, 2020
@lehnberg lehnberg deleted the coc branch September 14, 2020 18:34
@lehnberg lehnberg mentioned this pull request Sep 17, 2020
Closed
7 tasks
lehnberg added a commit to lehnberg/grin that referenced this pull request Sep 17, 2020
@lehnberg
Update Code of Conduct
b71361a 
Replace old CoC with a link to the website with the updated code of conduct.

Related:
mimblewimble/site#222
mimblewimble/grin-pm#309
@lehnberg lehnberg mentioned this pull request Sep 17, 2020
Merged
antiochp pushed a commit to mimblewimble/grin that referenced this pull request Sep 22, 2020
@lehnberg
Update Code of Conduct (#3447)
f40564e 
Replace old CoC with a link to the website with the updated code of conduct.

Related:
mimblewimble/site#222
mimblewimble/grin-pm#309
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@quentinlesceller quentinlesceller quentinlesceller approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@lehnberg @Paouky @antiochp @quentinlesceller