From 58b3cff7f657536773e078cf5e177592fd33b1d1 Mon Sep 17 00:00:00 2001
From: Kunal Nagpal <kunagpal@gmail.com>
Date: Fri, 9 Jun 2017 00:34:17 +0530
Subject: [PATCH 1/3] docs(meta): Added issue, pull request templates. :scroll:
 [ci skip]

---
 .github/ISSUE_TEMPLATE.md        | 40 ++++++++++++++++++++++++++++++++
 .github/PULL_REQUEST_TEMPLATE.md | 32 +++++++++++++++++++++++++
 2 files changed, 72 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE.md
 create mode 100644 .github/PULL_REQUEST_TEMPLATE.md

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000000..6b103ea0e1
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,40 @@
+<!--
+Have you read Mocha's Code of Conduct? By filing an Issue, you are expected to comply with it, including treating everyone with respect: https://github.com/mochajs/mocha/blob/master/.github/CODE_OF_CONDUCT.md
+For more, check out the Mocha gitter space: https://gitter.im/mochajs/mocha
+-->
+
+### Prerequisites
+<!--
+Place an `x` between the square brackets on the lines below for every satisified prerequisite.
+-->
+* [ ] Checked that your issue isn't already filed by cross referencing [issues with the `common mistake` label](https://github.com/mochajs/mocha/issues?utf8=%E2%9C%93&q=is%3Aissue%20label%3Acommon-mistake%20) 
+* [ ] Checked next-gen ES issues and syntax problems by using the same environment and/or transpiler configuration without Mocha to ensure it isn't just a feature that actually isn't supported in the environment in question or a bug in the user's code.
+* [ ] 'Smoke tested' the code to be tested by running it outside the real test suite to get a better sense of whether the problem is in the code under test, the user's usage of Mocha, or Mocha itself
+
+### Description
+<!--
+[Description of the issue]
+-->
+
+### Steps to Reproduce
+
+<!--
+Please add a series of steps to reproduce the problem. See https://stackoverflow.com/help/mcve for in depth information
+on how to create a mimimal, complete, and verifiable example.
+-->
+
+**Expected behavior:** [What you expect to happen]
+
+**Actual behavior:** [What actually happens]
+
+**Reproduces how often:** [What percentage of the time does it reproduce?]
+
+### Versions
+<!--
+You can get this information from copy and pasting the output of `mocha --version` from the command line. Also, please include the OS and what version of the OS you're running.
+-->
+
+### Additional Information
+<!--
+Any additional information, configuration or data that might be necessary to reproduce the issue.
+-->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000000..fb10d2a98b
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,32 @@
+### Requirements
+
+* Filling out the template is required. Any pull request that does not include enough information to be reviewed in a timely manner may be closed at the maintainers' discretion.
+* All new code requires tests to ensure against regressions
+
+### Description of the Change
+
+<!--
+
+We must be able to understand the design of your change from this description. If we can't get a good idea of what the code will be doing from the description here, the pull request may be closed at the maintainers' discretion. Keep in mind that the maintainer reviewing this PR may not be familiar with or have worked with the code here recently, so please walk us through the concepts.
+
+-->
+
+### Alternate Designs
+
+<!-- Explain what other alternates were considered and why the proposed version was selected -->
+
+### Why Should This Be In Core?
+
+<!-- Explain why this functionality should be in mocha as opposed to a package -->
+
+### Benefits
+
+<!-- What benefits will be realized by the code change? -->
+
+### Possible Drawbacks
+
+<!-- What are the possible side-effects or negative impacts of the code change? -->
+
+### Applicable Issues
+
+<!-- Enter any applicable Issues here -->

From 1d2da879e6db8502947c3f8903c1045104a7bc86 Mon Sep 17 00:00:00 2001
From: Kunal Nagpal <kunagpal@gmail.com>
Date: Fri, 9 Jun 2017 23:49:50 +0530
Subject: [PATCH 2/3] Addressed PR#2869 comments [ci skip]

---
 .github/ISSUE_TEMPLATE.md | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 6b103ea0e1..7085cfc263 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -8,8 +8,10 @@ For more, check out the Mocha gitter space: https://gitter.im/mochajs/mocha
 Place an `x` between the square brackets on the lines below for every satisified prerequisite.
 -->
 * [ ] Checked that your issue isn't already filed by cross referencing [issues with the `common mistake` label](https://github.com/mochajs/mocha/issues?utf8=%E2%9C%93&q=is%3Aissue%20label%3Acommon-mistake%20) 
-* [ ] Checked next-gen ES issues and syntax problems by using the same environment and/or transpiler configuration without Mocha to ensure it isn't just a feature that actually isn't supported in the environment in question or a bug in the user's code.
-* [ ] 'Smoke tested' the code to be tested by running it outside the real test suite to get a better sense of whether the problem is in the code under test, the user's usage of Mocha, or Mocha itself
+* [ ] Checked next-gen ES issues and syntax problems by using the same environment and/or transpiler configuration without Mocha to ensure it isn't just a feature that actually isn't supported in the environment in question or a bug in your code.
+* [ ] 'Smoke tested' the code to be tested by running it outside the real test suite to get a better sense of whether the problem is in the code under test, your usage of Mocha, or Mocha itself
+* [ ] Ensured that there is no discrepancy between the locally and globally installed versions of Mocha. You can find them with:
+`node node_modules/mocha/bin/mocha* --version`(Local) and `mocha -v`(Global). We recommend avoiding the use of globally installed Mocha.
 
 ### Description
 <!--
@@ -31,7 +33,10 @@ on how to create a mimimal, complete, and verifiable example.
 
 ### Versions
 <!--
-You can get this information from copy and pasting the output of `mocha --version` from the command line. Also, please include the OS and what version of the OS you're running.
+You can get this information from copy and pasting the output of `mocha --version` from the command line.
+ Also, please include the following:
+ * The version and architecture of the operation system being used.
+ * The Node version (`node -v`)
 -->
 
 ### Additional Information

From 0afcde5e722d966ee08d4a0423115688e07c47cf Mon Sep 17 00:00:00 2001
From: Kunal Nagpal <kunal@getpostman.com>
Date: Thu, 15 Jun 2017 23:07:41 +0530
Subject: [PATCH 3/3] Addressed some more comments on PR#2869 [skip ci]

---
 .github/ISSUE_TEMPLATE.md        | 18 +++++++++++-------
 .github/PULL_REQUEST_TEMPLATE.md | 20 ++++++++++++++------
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 7085cfc263..8d7e7d1baa 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,17 +1,17 @@
 <!--
 Have you read Mocha's Code of Conduct? By filing an Issue, you are expected to comply with it, including treating everyone with respect: https://github.com/mochajs/mocha/blob/master/.github/CODE_OF_CONDUCT.md
-For more, check out the Mocha gitter space: https://gitter.im/mochajs/mocha
+For more, check out the Mocha Gitter chat room: https://gitter.im/mochajs/mocha
 -->
 
 ### Prerequisites
 <!--
 Place an `x` between the square brackets on the lines below for every satisified prerequisite.
 -->
-* [ ] Checked that your issue isn't already filed by cross referencing [issues with the `common mistake` label](https://github.com/mochajs/mocha/issues?utf8=%E2%9C%93&q=is%3Aissue%20label%3Acommon-mistake%20) 
+* [ ] Checked that your issue isn't already filed by cross referencing [issues with the `common mistake` label](https://github.com/mochajs/mocha/issues?utf8=%E2%9C%93&q=is%3Aissue%20label%3Acommon-mistake%20)
 * [ ] Checked next-gen ES issues and syntax problems by using the same environment and/or transpiler configuration without Mocha to ensure it isn't just a feature that actually isn't supported in the environment in question or a bug in your code.
 * [ ] 'Smoke tested' the code to be tested by running it outside the real test suite to get a better sense of whether the problem is in the code under test, your usage of Mocha, or Mocha itself
 * [ ] Ensured that there is no discrepancy between the locally and globally installed versions of Mocha. You can find them with:
-`node node_modules/mocha/bin/mocha* --version`(Local) and `mocha -v`(Global). We recommend avoiding the use of globally installed Mocha.
+`node node_modules/.bin/mocha --version`(Local) and `mocha --version`(Global). We recommend avoiding the use of globally installed Mocha.
 
 ### Description
 <!--
@@ -33,10 +33,14 @@ on how to create a mimimal, complete, and verifiable example.
 
 ### Versions
 <!--
-You can get this information from copy and pasting the output of `mocha --version` from the command line.
- Also, please include the following:
- * The version and architecture of the operation system being used.
- * The Node version (`node -v`)
+ If applicable, please specify:
+ * The output of `mocha --version` and `node node_modules/.bin/mocha --version`:
+ * The output of `node --version`:
+ * The version and architecture of your operating system:
+ * Your shell (bash, zsh, PowerShell, cmd, etc.):
+ * Your browser and version (if running browser tests):
+ * Any other third party Mocha related modules (with versions):
+ * The code transpiler being used:
 -->
 
 ### Additional Information
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index fb10d2a98b..0252085436 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,13 +1,13 @@
 ### Requirements
 
 * Filling out the template is required. Any pull request that does not include enough information to be reviewed in a timely manner may be closed at the maintainers' discretion.
-* All new code requires tests to ensure against regressions
+* All new code requires tests to ensure against regressions.
 
 ### Description of the Change
 
 <!--
 
-We must be able to understand the design of your change from this description. If we can't get a good idea of what the code will be doing from the description here, the pull request may be closed at the maintainers' discretion. Keep in mind that the maintainer reviewing this PR may not be familiar with or have worked with the code here recently, so please walk us through the concepts.
+We must be able to understand the design of your change from this description. Keep in mind that the maintainers and/or community members reviewing this PR may not be familiar with the subsystem. Please be verbose.
 
 -->
 
@@ -15,9 +15,9 @@ We must be able to understand the design of your change from this description. I
 
 <!-- Explain what other alternates were considered and why the proposed version was selected -->
 
-### Why Should This Be In Core?
+### Why should this be in core?
 
-<!-- Explain why this functionality should be in mocha as opposed to a package -->
+<!-- Explain why this functionality should be in mocha as opposed to it's own package -->
 
 ### Benefits
 
@@ -27,6 +27,14 @@ We must be able to understand the design of your change from this description. I
 
 <!-- What are the possible side-effects or negative impacts of the code change? -->
 
-### Applicable Issues
+### Applicable issues
 
-<!-- Enter any applicable Issues here -->
+<!--
+* Enter any applicable Issues here.
+
+* Mocha follows semantic versioning: http://semver.org
+
+* Is this a breaking change (major release)?
+* Is it an enhancement (minor release)?
+* Is it a bug fix, or does it not impact production code (patch release)?
+-->