-
Notifications
You must be signed in to change notification settings - Fork 606
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.
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
Proposed Code of Conduct Updates for January 2025 #941
Open
jeremyrickard
wants to merge
2
commits into
cncf:main
Choose a base branch
from
jeremyrickard:coc-updates-jan-2025
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+5
−0
Open
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -70,6 +70,9 @@ Examples of unacceptable behavior include but are not limited to: | |
* Stalking or following someone without their consent | ||
* Unwelcome physical contact | ||
* Unwelcome sexual or romantic attention or advances | ||
* Using CNCF projects or community spaces for political campaigning or promotion of political causes | ||
that are unrelated to the advancement of cloud native technology. For clarity, this does not restrict | ||
individuals’ personal attire. Please see the Code of Conduct FAQ for more information. | ||
* Other conduct which could reasonably be considered inappropriate in a | ||
professional setting | ||
|
||
|
@@ -90,6 +93,9 @@ For other projects, or for incidents that are project-agnostic or impact multipl | |
|
||
For incidents occurring at CNCF event that is produced by the Linux Foundation, please contact <[email protected]>. | ||
|
||
## Frequently asked questions | ||
For more information about this Code of Conduct, please see the [CNCF Code of Conduct Frequently Asked Questions](https://www.cncf.io/conduct/faq/). | ||
|
||
## Enforcement | ||
|
||
Upon review and investigation of a reported incident, the CoC response team that has jurisdiction will determine what action is appropriate based on this Code of Conduct and its related documentation. | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
mostly nits!!
For clarity, this does not restrict individuals' personal attire
could be phrased better.To clarify, this policy does not restrict individuals from expressing personal views through their attire
perhaps?thanks @jeremyrickard !
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
+1 to @dims comments
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@dims I pushed a new commit that I think addresses comments 1-3.
I don't believe we have added a PR for the FAQ change. Let me verify if we have that ready to go and I'll handle it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thanks @jeremyrickard !
LGTM