From 96fe454cf70edfdcd670345cd2614d1d803f558d Mon Sep 17 00:00:00 2001 From: "&! (bitandbang)" Date: Sun, 22 Feb 2015 12:25:20 -0500 Subject: [PATCH 1/3] Add Contribution Guidelines Added contribution guidelines: Code, PRs, and Off-Topic. --- CONTRIBUTING.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 177fa27..767b31d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -15,6 +15,22 @@ By making a contribution to this project, I certify that: person who certified (a), (b) or (c) and I have not modified it. +## Contribution Guidelines + +While you're working on contributions, and submitting pull requests (PRs) to add those contributions, to this project, please keep these guidelines in mind. We _expect_ submitted code, and its associated PR, to follow these standards. Please follow them so you don't have to lose your time fixing your PRs, and so we don't have to lose time explaining why. + +#### Code +* __One function per PR:__ Please add only one function or feature with one PR. The project is easier to maintain when we can easily grasp everything a PR is doing, and can reference each feature by individual PR in the future. + +#### Pull Requests +* __PR Timeout__: If a PR has merge conflicts or one or more downvotes and the author of a PR doesn't respond to inquiries or requests posted to the PR issue after 72 hours, the PR will be closed. +* __Controversial PRs:__ If a PR is controversial, it will be discussed by Contributors in the issue, and, if required, in the bi-weekly Website Working Group (WG) meeting. +* __Two contributor votes for merge:__ Two WG members of Contributor status will need to approve, or +1, your contribution in order for it to be accepted and merged into the main repo. + +#### Off-topic +* __Off topic PRs:__ Please, avoid posting off-topic issues and PRs. + + ## Code of Conduct This Code of Conduct is adapted from [Rust's wonderful From 761b3039f209fd35334c0b030923ce3ed5e1bb89 Mon Sep 17 00:00:00 2001 From: "&! (bitandbang)" Date: Wed, 1 Jul 2015 11:53:44 -0400 Subject: [PATCH 2/3] Update CONTRIBUTING.md to resolve comments made. --- CONTRIBUTING.md | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 767b31d..12af52b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -17,18 +17,15 @@ By making a contribution to this project, I certify that: ## Contribution Guidelines -While you're working on contributions, and submitting pull requests (PRs) to add those contributions, to this project, please keep these guidelines in mind. We _expect_ submitted code, and its associated PR, to follow these standards. Please follow them so you don't have to lose your time fixing your PRs, and so we don't have to lose time explaining why. +While you're working on contributions, and submitting pull requests (PRs) to add those contributions, to this project, please keep these guidelines in mind. We _expect_ submitted code, and its associated PR, to follow our standards. When submitting code, you can ensure you follow these standards by utilizing our .editorconfig file, located in the root folder of this repository. If you follow our procedures, nobody's time will need to be spent fixing your time fixing PRs to the satisfaction of both yourself and the Website WG Contributors. #### Code -* __One function per PR:__ Please add only one function or feature with one PR. The project is easier to maintain when we can easily grasp everything a PR is doing, and can reference each feature by individual PR in the future. +* __One topic per PR:__ Please commit code/writing covering a single topic or feature with a single PR. The project is easier to maintain when we can easily grasp everything a PR is doing, and can reference each feature by individual PR in the future. #### Pull Requests -* __PR Timeout__: If a PR has merge conflicts or one or more downvotes and the author of a PR doesn't respond to inquiries or requests posted to the PR issue after 72 hours, the PR will be closed. +* __PR Timeout__: If a PR has merge conflicts or one or more downvotes and the author of a PR doesn't respond to inquiries or requests posted to the PR issue, the PR will be closed at the discretion of a WG Contributor. * __Controversial PRs:__ If a PR is controversial, it will be discussed by Contributors in the issue, and, if required, in the bi-weekly Website Working Group (WG) meeting. -* __Two contributor votes for merge:__ Two WG members of Contributor status will need to approve, or +1, your contribution in order for it to be accepted and merged into the main repo. - -#### Off-topic -* __Off topic PRs:__ Please, avoid posting off-topic issues and PRs. +* __Contributor votes for merge:__ WG members will need to approve, or +1, your contribution in order for it to be accepted and merged into the main repo. ## Code of Conduct @@ -59,7 +56,7 @@ CoC](https://github.com/rust-lang/rust/wiki/Note-development-policy#conduct). you feel you have been or are being harassed or made uncomfortable by a community member, please contact one of the channel ops or any of the TC members immediately with a capture (log, photo, email) of - the harassment if possible. Whether you're a regular contributor or + the harassment if possible. Whether you're a regular Contributor or a newcomer, we care about making this community a safe place for you and we've got your back. * Likewise any spamming, trolling, flaming, baiting or other From 37025cda0767db4e9f41c37486dfdcd6a385d2cb Mon Sep 17 00:00:00 2001 From: "&! (bitandbang)" Date: Thu, 2 Jul 2015 10:37:24 -0400 Subject: [PATCH 3/3] Fixed grammar error. --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 12af52b..bdd957a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -17,7 +17,7 @@ By making a contribution to this project, I certify that: ## Contribution Guidelines -While you're working on contributions, and submitting pull requests (PRs) to add those contributions, to this project, please keep these guidelines in mind. We _expect_ submitted code, and its associated PR, to follow our standards. When submitting code, you can ensure you follow these standards by utilizing our .editorconfig file, located in the root folder of this repository. If you follow our procedures, nobody's time will need to be spent fixing your time fixing PRs to the satisfaction of both yourself and the Website WG Contributors. +While you're working on contributions, and submitting pull requests (PRs) to add those contributions, to this project, please keep these guidelines in mind. We _expect_ submitted code, and its associated PR, to follow our standards. When submitting code, you can ensure you follow these standards by utilizing our .editorconfig file, located in the root folder of this repository. If these procedures are followed, fixing PRs to the satisfaction of both the submitter and the Website WG Contributors will be simplified greatly. #### Code * __One topic per PR:__ Please commit code/writing covering a single topic or feature with a single PR. The project is easier to maintain when we can easily grasp everything a PR is doing, and can reference each feature by individual PR in the future.