From a4ec4240bea2436193d4572f867e176089753613 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Thu, 13 Oct 2016 12:05:31 -0700 Subject: [PATCH 1/3] Add how we QA and how we close stale issues sections --- CONTRIBUTING.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 09e9d0af93..f4ce4c78f7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -26,6 +26,8 @@ Remember to feel free to ask for help in our [Contributors](https://gitter.im/Fr - [Squash Your Commits](#squash-your-commits) - [Creating A Pull Request](#creating-a-pull-request) - [Common Steps](#common-steps) +- [How We Review and Merge Pull Requests](#how-we-review-and-merge-pull-requests) +- [How We Close Stale Issues](#how-we-close-stale-issues) - [Next Steps](#next-steps) - [Other resources](#other-resources) @@ -338,6 +340,25 @@ for further information 6. Indicate if you have tested on a local copy of the site or not. + +### How We Review and Merge Pull Requests + +Free Code Camp has a team of volunteer Issue Moderators. These Issue Moderators routinely go through open pull requests in a process called [Quality Assurance](https://en.wikipedia.org/wiki/Quality_assurance) (QA). + +1. If an Issue Moderator QA's a pull request and confirms that the new code does what it is supposed without seeming to introduce any new bugs, they will comment "LGTM" which means "Looks good to me." + +2. Another Issue Moderator will QA the same pull request. Once they have also confirmed that the new code does what it is supposed to without seeming to introduce any new bugs, they will merge the pull request. + +If you would like to apply to join our Issue Moderator team - which is a Core Team position - message @berkeleytrue with links to a 5 of your pull requests that have been accepted and 5 issues where you have helped someone else through commneting or QA'ing. + + +### How We Close Stale Issues + +We will close any issues or pull requests that have been inactive for more than 15 days, except those that match the following criteria: +- bugs that are confirmed +- pull requests that are waiting on other pull requests +- features that are a part of a GitHub project + ### Next Steps #### If your PR is accepted From a32b521b1bb0db72fe068c87f0e2659d1d3bf7dd Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Thu, 13 Oct 2016 15:20:11 -0700 Subject: [PATCH 2/3] Fixes recommended by @atjonathan --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f4ce4c78f7..7f7962b0ea 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -349,14 +349,14 @@ Free Code Camp has a team of volunteer Issue Moderators. These Issue Moderators 2. Another Issue Moderator will QA the same pull request. Once they have also confirmed that the new code does what it is supposed to without seeming to introduce any new bugs, they will merge the pull request. -If you would like to apply to join our Issue Moderator team - which is a Core Team position - message @berkeleytrue with links to a 5 of your pull requests that have been accepted and 5 issues where you have helped someone else through commneting or QA'ing. +If you would like to apply to join our Issue Moderator team - which is a Core Team position - message [@berkeleytrue](https://gitter.im/berkeleytrue) with links to 5 of your pull requests that have been accepted and 5 issues where you have helped someone else through commneting or QA'ing. ### How We Close Stale Issues We will close any issues or pull requests that have been inactive for more than 15 days, except those that match the following criteria: - bugs that are confirmed -- pull requests that are waiting on other pull requests +- pull requests that are waiting on other pull requests to be merged - features that are a part of a GitHub project ### Next Steps From d858c6cc22c24e2b1a71ef19a623edbf89c012de Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Fri, 14 Oct 2016 10:21:42 -0700 Subject: [PATCH 3/3] fix-typo --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7f7962b0ea..537ab100c9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -349,7 +349,7 @@ Free Code Camp has a team of volunteer Issue Moderators. These Issue Moderators 2. Another Issue Moderator will QA the same pull request. Once they have also confirmed that the new code does what it is supposed to without seeming to introduce any new bugs, they will merge the pull request. -If you would like to apply to join our Issue Moderator team - which is a Core Team position - message [@berkeleytrue](https://gitter.im/berkeleytrue) with links to 5 of your pull requests that have been accepted and 5 issues where you have helped someone else through commneting or QA'ing. +If you would like to apply to join our Issue Moderator team - which is a Core Team position - message [@berkeleytrue](https://gitter.im/berkeleytrue) with links to 5 of your pull requests that have been accepted and 5 issues where you have helped someone else through commenting or QA'ing. ### How We Close Stale Issues