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.

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

Replace code of conduct with link #65141

Merged
merged 1 commit into from Oct 9, 2019
Merged

Replace code of conduct with link #65141

merged 1 commit into from Oct 9, 2019

Conversation

ghost
Copy link

@ghost ghost commented Oct 5, 2019

This will replace the code of conduct and link to a single version at https://www.rust-lang.org/conduct.html
Fixes #61531 (comment)

r? @Mark-Simulacrum

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 5, 2019
@ghost

This comment has been minimized.

@Mark-Simulacrum
Copy link
Member

I'm going to @bors r+ rollup

I think other repositories can do this if they want, I'm not personally intending to approve those PRs if you file them as it's out of my purview :)

@bors
Copy link
Contributor

bors commented Oct 8, 2019

📌 Commit 45835e9 has been approved by Mark-Simulacrum

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 8, 2019
Centril added a commit to Centril/rust that referenced this pull request Oct 8, 2019
…crum

Replace code of conduct with link

This will replace the code of conduct and link to a single version at https://www.rust-lang.org/conduct.html
Fixes rust-lang#61531 (comment)

r? @Mark-Simulacrum
bors added a commit that referenced this pull request Oct 8, 2019
Rollup of 7 pull requests

Successful merges:

 - #64284 (Warn if include macro fails to include entire file)
 - #65081 (Remove -Zprofile-queries)
 - #65133 (typeck: prohibit foreign statics w/ generics)
 - #65135 (Add check for missing tests for error codes)
 - #65141 (Replace code of conduct with link)
 - #65194 (Use structured suggestion for removal of `as_str()` call)
 - #65213 (Ignore `ExprKind::DropTemps` for some ref suggestions)

Failed merges:

r? @ghost
@bors bors merged commit 45835e9 into rust-lang:master Oct 9, 2019
@therealprof
Copy link
Contributor

You've removed the contact link to the responsible team, is that intended (i.e. is the Rust Moderation team responsible for handling CoC violations globally for all Rust initiatives)?

@Mark-Simulacrum
Copy link
Member

No - I thought the text was the same between the website and this file. We should update the website if that's not the case.

@therealprof
Copy link
Contributor

No - I thought the text was the same between the website and this file. We should update the website if that's not the case.

In this particular case that's correct but the other books mentioned may have different contacts, at least the embedded book does for sure. By simply pointing to the code of conduct site, visitors will only see the referrals to the Rust Moderation team in various places.

@Mark-Simulacrum
Copy link
Member

Not sure I follow you. If I'm understanding, that's one reason why I did not note here that making this change elsewhere may not be as clear-cut and I would not be able to approve it elsewhere.

@therealprof
Copy link
Contributor

@Mark-Simulacrum

I had the impression that you suggested that other repositories are invited to make the same change when you said:

I think other repositories can do this if they want,

which stimulated my curiosity about whether the moderation team is willing to take the lead on handling CoC topics and complaints globally.

@Mark-Simulacrum
Copy link
Member

Oh. I did not (and do not intend) to suggest any change to moderation team policies. I believe, but do not consider this official word, that we do not intend the moderation team to get involved in any non-official places (rust-lang org, and projects under it, are official places, I believe).

@therealprof
Copy link
Contributor

Thanks for the clarification.

@ghost ghost deleted the code-of-conduct branch October 9, 2019 15:36
allan2 added a commit to allan2/rustc-hash that referenced this pull request Nov 20, 2021
This change is to be consistent with [rust-lang/rust](https://github.com/rust-lang/rust).
Their change was made in October 2019. The PR over there: [Replace code of conduct with link #65141](rust-lang/rust#65141)
allan2 added a commit to allan2/rustc-hash that referenced this pull request Nov 20, 2021
This change is to be consistent with rust-lang/rust.
Their change was made in December 2019. The PR over there: [Remove appendix from LICENCE-APACHE](rust-lang/rust#65141)
allan2 added a commit to allan2/rustc-hash that referenced this pull request Nov 20, 2021
This change is to be consistent with rust-lang/rust.
Their change was made in October 2019. The PR over there: [Replace code of conduct with link #65141](rust-lang/rust#65141)
allan2 added a commit to allan2/rustc-hash that referenced this pull request Nov 20, 2021
This change is to be consistent with rust-lang/rust.
Their change was made in December 2019. The PR over there: [Remove appendix from LICENCE-APACHE](rust-lang/rust#65141)
allan2 added a commit to allan2/rustc-hash that referenced this pull request Nov 20, 2021
This change is to be consistent with rust-lang/rust.
Their change was made in October 2019. The PR over there: [Replace code of conduct with link #65141](rust-lang/rust#65141)
allan2 added a commit to allan2/rustc-hash that referenced this pull request Nov 20, 2021
This change is to be consistent with rust-lang/rust.
Their change was made in December 2019. The PR over there: [Remove appendix from LICENCE-APACHE](rust-lang/rust#65141)
allan2 added a commit to allan2/rustc-hash that referenced this pull request Mar 1, 2024
This change is to be consistent with rust-lang/rust.
Their change was made in October 2019. The PR over there: [Replace code of conduct with link #65141](rust-lang/rust#65141)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants