From 4e9d2d0a7f0df722d20b306b280bf9b2c49d0eda Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Date: Sun, 21 Sep 2014 17:45:58 +0200 Subject: [PATCH 1/7] Added 'RFC and Voting' to CONTRIBUTING.md --- CONTRIBUTING.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9de62a130..2d07ea17f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -27,6 +27,17 @@ You must follow these guidelines if you wish to contribute to the PocketMine-MP * Use descriptive commit titles * __No merge commits are allowed, or multiple features per pull request__ +## RFC and voting +* These are big Pull Request or contributions that changes important behaviour. +* A vote will be held. All users can vote commenting on the Pull Request +* Comments MUST use Yes or No to signify the vote, on the FIRST sentence, except they don't want it to be counted. +* If your comment is a voting comment, specify the reason of your vote or it won't be counted. +* After voting has been closed, no further votes will be counted. +* An RFC will be rejected if less than 50% + 1 (simple majority) has voted Yes. +* If the RFC is approved, Team Members have the final word on it's implementation or rejection. +* RFCs with complex voting options will specify the vote percentage or other details. + + **Thanks for contributing to PocketMine-MP!** ### Code Syntax From addd74d09e9cd4dc4a98df5792c19f503b4da1c6 Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Date: Sun, 21 Sep 2014 17:51:35 +0200 Subject: [PATCH 2/7] Fix typo, added PR: Request for Comments label --- CONTRIBUTING.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2d07ea17f..383cae38a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -28,7 +28,8 @@ You must follow these guidelines if you wish to contribute to the PocketMine-MP * __No merge commits are allowed, or multiple features per pull request__ ## RFC and voting -* These are big Pull Request or contributions that changes important behaviour. +* These are big Pull Request or contributions that changes important behavior. +* RFCs will be tagged with the *PR: Request for Comments* label * A vote will be held. All users can vote commenting on the Pull Request * Comments MUST use Yes or No to signify the vote, on the FIRST sentence, except they don't want it to be counted. * If your comment is a voting comment, specify the reason of your vote or it won't be counted. From f191ada405891a29a67a77f36e748a1ade586804 Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Date: Sun, 21 Sep 2014 18:33:34 +0200 Subject: [PATCH 3/7] Fixed text typo --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 383cae38a..321dee526 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -35,7 +35,7 @@ You must follow these guidelines if you wish to contribute to the PocketMine-MP * If your comment is a voting comment, specify the reason of your vote or it won't be counted. * After voting has been closed, no further votes will be counted. * An RFC will be rejected if less than 50% + 1 (simple majority) has voted Yes. -* If the RFC is approved, Team Members have the final word on it's implementation or rejection. +* If the RFC is approved, Team Members have the final word on its implementation or rejection. * RFCs with complex voting options will specify the vote percentage or other details. From 5ff01de4131a3694acc1f4969a52ea32f2350ef7 Mon Sep 17 00:00:00 2001 From: TNPXXSHEEPDOG Date: Sun, 21 Sep 2014 15:05:08 -0400 Subject: [PATCH 4/7] Update CONTRIBUTING.md Smoothed out wording, fix grammar. --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 321dee526..322109bdf 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -28,10 +28,10 @@ You must follow these guidelines if you wish to contribute to the PocketMine-MP * __No merge commits are allowed, or multiple features per pull request__ ## RFC and voting -* These are big Pull Request or contributions that changes important behavior. +* These are big Pull Requests or contributions that change important behavior. * RFCs will be tagged with the *PR: Request for Comments* label * A vote will be held. All users can vote commenting on the Pull Request -* Comments MUST use Yes or No to signify the vote, on the FIRST sentence, except they don't want it to be counted. +* Comments MUST use "Yes" or "No" on the FIRST sentence to signify the vote,except when they don't want it to be counted. * If your comment is a voting comment, specify the reason of your vote or it won't be counted. * After voting has been closed, no further votes will be counted. * An RFC will be rejected if less than 50% + 1 (simple majority) has voted Yes. From 9258281546a9cf10c3db24c769eea1dc48bbe921 Mon Sep 17 00:00:00 2001 From: Intyre Date: Sun, 21 Sep 2014 21:18:37 +0200 Subject: [PATCH 5/7] Fixed missing whitespace --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 322109bdf..95e9673cb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -31,7 +31,7 @@ You must follow these guidelines if you wish to contribute to the PocketMine-MP * These are big Pull Requests or contributions that change important behavior. * RFCs will be tagged with the *PR: Request for Comments* label * A vote will be held. All users can vote commenting on the Pull Request -* Comments MUST use "Yes" or "No" on the FIRST sentence to signify the vote,except when they don't want it to be counted. +* Comments MUST use "Yes" or "No" on the FIRST sentence to signify the vote, except when they don't want it to be counted. * If your comment is a voting comment, specify the reason of your vote or it won't be counted. * After voting has been closed, no further votes will be counted. * An RFC will be rejected if less than 50% + 1 (simple majority) has voted Yes. From 3b56b536b699e2f9490ac6d0065ed521e838a087 Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Date: Mon, 22 Sep 2014 08:46:03 +0200 Subject: [PATCH 6/7] Changed RFC label --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 95e9673cb..4d7f0ab5f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -29,7 +29,7 @@ You must follow these guidelines if you wish to contribute to the PocketMine-MP ## RFC and voting * These are big Pull Requests or contributions that change important behavior. -* RFCs will be tagged with the *PR: Request for Comments* label +* RFCs will be tagged with the *PR: RFC* label * A vote will be held. All users can vote commenting on the Pull Request * Comments MUST use "Yes" or "No" on the FIRST sentence to signify the vote, except when they don't want it to be counted. * If your comment is a voting comment, specify the reason of your vote or it won't be counted. From b3ae6eae04ab57dd92d981b29990a394f13f2812 Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Date: Mon, 22 Sep 2014 09:30:14 +0200 Subject: [PATCH 7/7] Added RFC ready status, added new label to label list --- CONTRIBUTING.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4d7f0ab5f..f218f4b62 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -27,10 +27,10 @@ You must follow these guidelines if you wish to contribute to the PocketMine-MP * Use descriptive commit titles * __No merge commits are allowed, or multiple features per pull request__ -## RFC and voting +## RFC and Voting * These are big Pull Requests or contributions that change important behavior. * RFCs will be tagged with the *PR: RFC* label -* A vote will be held. All users can vote commenting on the Pull Request +* A vote will be held once the RFC is ready. All users can vote commenting on the Pull Request * Comments MUST use "Yes" or "No" on the FIRST sentence to signify the vote, except when they don't want it to be counted. * If your comment is a voting comment, specify the reason of your vote or it won't be counted. * After voting has been closed, no further votes will be counted. @@ -103,6 +103,7 @@ Category labels are prefixed by `C:`. Multiple category labels may be applied to Pull Requests are prefixed by `PR:`. Only one label may be applied for a Pull Request. - PR: Bug Fix - This label is applied when the Pull Request fixes a bug. - PR: Contribution - This label is applied when the Pull Request contributes code to PocketMine-MP such as a new feature or an improvement. + - PR: RFC - Request for Comments #### Status Status labels show the status of the issue. Multiple status labels may be applied.