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

Update Code of Conduct #7161

Merged
merged 1 commit into from
Feb 20, 2020
Merged

Update Code of Conduct #7161

merged 1 commit into from
Feb 20, 2020

Conversation

garethwhittaker
Copy link
Contributor

What it does

Resolves: #6691
Update the code of conduct to the new version adopted by the Eclipse Foundation.

How to test

Ensure the updated Code of Conduct matches the new version adopted by the Eclipse Foundation.

Review checklist

Reminder for reviewers

@vince-fugnitto
Copy link
Member

@garethwhittaker do you mind providing the link to where you retrieved the updated code of conduct? The most updated one I see is of October 21, 2019.

@vince-fugnitto vince-fugnitto added the documentation issues related to documentation label Feb 15, 2020
@garethwhittaker
Copy link
Contributor Author

I'll just change to use this date.
I wasn't sure if we should be setting our own date (ie. today) when updating ours.

@vince-fugnitto
Copy link
Member

I'll just change to use this date.
I wasn't sure if we should be setting our own date (ie. today) when updating ours.

I'm not 100% sure either, but I think we should keep the date present in the actual code of conduct from Eclipse to be safe.

vince-fugnitto
vince-fugnitto approved these changes Feb 17, 2020
View reviewed changes
Copy link
Member

@vince-fugnitto vince-fugnitto left a comment

Choose a reason for hiding this comment

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

Thank you for taking care of the update @garethwhittaker :)

@vince-fugnitto
Copy link
Member

@marcdumais-work just wanted to confirm it'd be fine to merge, the pull-request consists of adopting an updated code of conduct from the Eclipse Foundation.

@vince-fugnitto
Copy link
Member

@garethwhittaker do you mind rebasing and fixing the conflict?

@marcdumais-work
Copy link
Contributor

@marcdumais-work just wanted to confirm it'd be fine to merge, the pull-request consists of adopting an updated code of conduct from the Eclipse Foundation.

Having a look now

marcdumais-work
marcdumais-work approved these changes Feb 20, 2020
View reviewed changes
Copy link
Contributor

@marcdumais-work marcdumais-work left a comment

Choose a reason for hiding this comment

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

LGTM, thanks @garethwhittaker . You will need to rebase the commit since the CHANGELOG has changed in the meantime.

@garethwhittaker
Update Code of Conduct
9e2494d 
Resolves: #6691

Signed-off-by: Gareth Whittaker <garethwhittaker@hotmail.com>
@marcdumais-work
Copy link
Contributor

Thanks @garethwhittaker - merging.

@marcdumais-work marcdumais-work merged commit 532525f into eclipse-theia:master Feb 20, 2020
@garethwhittaker garethwhittaker deleted the code-of-conduct branch February 20, 2020 15:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vince-fugnitto vince-fugnitto vince-fugnitto approved these changes

@marcdumais-work marcdumais-work marcdumais-work approved these changes

Assignees
No one assigned
Labels
documentation issues related to documentation
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[documentation] update code of conduct
3 participants
@garethwhittaker @vince-fugnitto @marcdumais-work