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

Propagating upstream code of conduct changes #48824

Merged
merged 1 commit into from
Mar 13, 2018
Merged

Propagating upstream code of conduct changes #48824

merged 1 commit into from
Mar 13, 2018

Conversation

davidalber
Copy link
Contributor

This repository's code of conduct is out of sync with the rust-www code of conduct due changes from rust-lang/prev.rust-lang.org#1062. This PR propagates those changes and brings the files back into sync.

r? @steveklabnik

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @steveklabnik (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 7, 2018
@pietroalbini
Copy link
Member

Thanks for this PR! The triage team will make sure @steveklabnik (or someone else from @rust-lang/core) reviews this.

@steveklabnik
Copy link
Member

Thanks!

@bors: r+ rollup

@bors
Copy link
Contributor

bors commented Mar 12, 2018

📌 Commit ca1c91b has been approved by steveklabnik

@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 Mar 12, 2018
kennytm added a commit to kennytm/rust that referenced this pull request Mar 12, 2018
@kennytm
Rollup merge of rust-lang#48824 - davidalber:update-conduct, r=stevek…
e22a994 
…labnik

Propagating upstream code of conduct changes

[This repository's code of conduct](https://github.com/rust-lang/rust/blob/master/CODE_OF_CONDUCT.md) is out of sync with the [rust-www code of conduct](https://github.com/rust-lang/rust-www/blob/master/en-US/conduct.md) due changes from rust-lang/prev.rust-lang.org#1062. This PR propagates those changes and brings the files back into sync.

r? @steveklabnik
@kennytm kennytm mentioned this pull request Mar 12, 2018
Merged
bors added a commit that referenced this pull request Mar 12, 2018
@bors
Auto merge of #48955 - kennytm:rollup, r=kennytm
c7cbe14 
Rollup of 13 pull requests

- Successful merges: #48201, #48705, #48725, #48824, #48877, #48880, #48887, #48928, #48934, #48480, #48631, #48898, #48954
- Failed merges:
@bors bors merged commit ca1c91b into rust-lang:master Mar 13, 2018
@davidalber davidalber deleted the update-conduct branch March 13, 2018 04:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@steveklabnik steveklabnik steveklabnik approved these changes

Assignees

@steveklabnik steveklabnik

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@davidalber @rust-highfive @pietroalbini @steveklabnik @bors