Merge remote-tracking branch 'origin/master' into multi-diff-rfc

Author: kuychaco

.circleci/config.yml

@@ -38,6 +38,7 @@ jobs:
     - UNTIL_TIMEOUT: "30000"
     - CIRCLE_BUILD_IMAGE: osx
     - ATOM_CHANNEL: stable
+    - TEST_JUNIT_XML_PATH: test-results/mocha/test-results.xml
   beta:
     <<: *defaults
     environment:
@@ -51,6 +52,7 @@ jobs:
     - UNTIL_TIMEOUT: "30000"
     - CIRCLE_BUILD_IMAGE: osx
     - ATOM_CHANNEL: beta
+    - TEST_JUNIT_XML_PATH: test-results/mocha/test-results.xml
   dev:
     <<: *defaults
     environment:
@@ -64,6 +66,8 @@ jobs:
     - UNTIL_TIMEOUT: "30000"
     - CIRCLE_BUILD_IMAGE: osx
     - ATOM_CHANNEL: dev
+    - TEST_JUNIT_XML_PATH: test-results/mocha/test-results.xml
+
   snapshot:
     <<: *defaults
     environment:

docs/how-we-work.md

@@ -126,7 +126,7 @@ At the end of each development sprint:
   * :boom: _If the build fails,_ correct any bugs and begin again at (1) with a new prerelease version.
 4. Run `apm uninstall github` and `apm uninstall --dev github` to ensure that you don't have any [locally installed atom/github versions](/CONTRIBUTING.md#living-on-the-edge) that would override the bundled one.
 5. _In your atom/atom repository:_ Push your branch to atom/atom and open a pull request to start running CI.
-6. Create a [QA issue](https://github.com/atom/github/issues?utf8=%E2%9C%93&q=is%3Aissue+label%3Aquality) in the atom/github repository. Its title should be "_prerelease version_ QA Review" and it should have the "quality" label applied. Populate the issue body with a checklist containing the pull requests that were included in this release; these should be the ones in the "Merged" column of the project board. Omit pull requests that don't have verification steps (like renames, refactoring, or dependency upgrades, for example). Add a final entry for a clean CI check on the atom/atom pull request.
+6. Create a [QA issue](https://github.com/atom/github/issues?utf8=%E2%9C%93&q=is%3Aissue+label%3Aquality) in the atom/github repository. Its title should be "_prerelease version_ QA Review" and it should have the "quality" label applied. Populate the issue body with a checklist containing the pull requests that were included in this release; these should be the ones in the "Merged" column of the project board. Omit pull requests that don't have verification steps (like renames, refactoring, adding tests or metrics, or dependency upgrades, for example). Add a final entry for a clean CI check on the atom/atom pull request.
 7. Use your `atom-dev` build to verify each and check it off the list.
   * :boom: _If verification fails,_ note the failure in an issue comment. Close the issue. Correct the failure with more work in the current sprint board, then begin again at (1).
   * :white_check_mark: _Otherwise,_ comment in and close the issue, then continue.