Merge branch 'master' into pr-1805/atom/sm/commit-preview-tweaks

Author: vanessayuenn

.nycrc.json

@@ -6,6 +6,7 @@
   ],
   "exclude": [
     "lib/views/git-cache-view.js",
-    "lib/views/git-timings-view.js"
+    "lib/views/git-timings-view.js",
+    "lib/relay-network-layer-manager.js"
   ]
 }

.travis.yml

@@ -2,15 +2,15 @@
 
 | Build | Code Coverage | Dependencies |
 |-------|---------------|--------------|
-| [![Build Status](https://dev.azure.com/atom-github/GitHub%20package%20for%20Atom/_apis/build/status/atom.github)](https://dev.azure.com/atom-github/GitHub%20package%20for%20Atom/_build/latest?definitionId=1) | [![Coverage Status](https://coveralls.io/repos/github/atom/github/badge.svg?branch=master)](https://coveralls.io/github/atom/github?branch=master) | [![Greenkeeper badge](https://badges.greenkeeper.io/atom/github.svg)](https://greenkeeper.io/) [![Dependency Status](https://david-dm.org/atom/github.svg)](https://david-dm.org/atom/github) |
+| [![Build Status](https://dev.azure.com/atom-github/GitHub%20package%20for%20Atom/_apis/build/status/atom.github)](https://dev.azure.com/atom-github/GitHub%20package%20for%20Atom/_build/latest?definitionId=1) | [![codecov](https://codecov.io/gh/atom/github/branch/master/graph/badge.svg)](https://codecov.io/gh/atom/github) | [![Greenkeeper badge](https://badges.greenkeeper.io/atom/github.svg)](https://greenkeeper.io/) [![Dependency Status](https://david-dm.org/atom/github.svg)](https://david-dm.org/atom/github) |
 
 The Atom GitHub package provides Git and GitHub integration for Atom. Check out [github.atom.io](https://github.atom.io) for more information.
 
-<img width="880" alt="git-integration" src="https://user-images.githubusercontent.com/378023/42010937-0961e420-7acc-11e8-9aaa-417514317206.png">
+<img width="880" alt="GitHub for Atom" src="https://user-images.githubusercontent.com/378023/49062969-2e717a00-f259-11e8-8207-2ecbc6981cd6.png">
 
-<img width="880" alt="merge-conflicts" src="https://user-images.githubusercontent.com/378023/42010938-098e3430-7acc-11e8-95dd-770409785471.png">
+<img width="880" alt="git-integration" src="https://user-images.githubusercontent.com/378023/49062970-2f0a1080-f259-11e8-91e9-9402ec76cd66.png">
 
-<img width="880" alt="github-integration" src="https://user-images.githubusercontent.com/378023/42010939-09b90dea-7acc-11e8-899c-99fc7faeba8e.png">
+<img width="880" alt="github-integration" src="https://user-images.githubusercontent.com/378023/50207061-b4906480-03b0-11e9-92fb-57f7efa0982b.png">
 
 ## Installation
 

README.md

@@ -1,22 +1,3 @@
-trigger:
-  branches:
-    include:
-    - master
-    - releases/*
-  paths:
-    exclude:
-    - README.md
-    - docs/*
-
-pr:
-  branches:
-    include:
-    - "*"
-  paths:
-    exclude:
-    - README.md
-    - docs/*
-
 jobs:
 - job: Linux
   pool:
@@ -57,6 +38,11 @@ jobs:
   - bash: npm run report:coverage
     displayName: generate code coverage reports
     condition: succeededOrFailed()
+  - bash: npm run codecov -- --build="Linux $(atom_channel)"
+    displayName: publish code coverage to CodeCov
+    env:
+      CODECOV_TOKEN: $(codecov.token)
+    condition: succeededOrFailed()
   - task: PublishCodeCoverageResults@1
     inputs:
       codeCoverageTool: cobertura
@@ -101,6 +87,11 @@ jobs:
   - bash: npm run report:coverage
     displayName: generate code coverage reports
     condition: succeededOrFailed()
+  - bash: npm run codecov -- --build="MacOS $(atom_channel)"
+    displayName: publish code coverage to CodeCov
+    env:
+      CODECOV_TOKEN: $(codecov.token)
+    condition: succeededOrFailed()
   - task: PublishCodeCoverageResults@1
     inputs:
       codeCoverageTool: cobertura
@@ -165,6 +156,11 @@ jobs:
   - powershell: npm run report:coverage
     displayName: generate code coverage reports
     condition: succeededOrFailed()
+  - powershell: npm run codecov -- --build="Windows $(atom_channel)"
+    displayName: publish code coverage to CodeCov
+    env:
+      CODECOV_TOKEN: $(codecov.token)
+    condition: succeededOrFailed()
   - task: PublishCodeCoverageResults@1
     inputs:
       codeCoverageTool: cobertura

azure-pipelines.yml

@@ -0,0 +1,10 @@
+coverage:
+  status:
+    project:
+      default:
+        # Allow coverage to drop by as much as 2% from the parent commit or pull request base
+        threshold: 2
+
+    patch:
+      default:
+        threshold: 2

codecov.yml

@@ -57,9 +57,9 @@ The problem at hand is decomposed into a queue of relatively independent tasks t
 
 ### 3. Hand-offs
 
-In this method, each developer (or pair) tackles a single problem in serial during their working hours. When the next developer becomes available, the previous one writes a summary of their efforts and progress in a hand-off, either synchronously and interactively in Slack or asynchronously with a pull request comment. Once the next developer is caught up, they make progress and hand off to the next, and so on.
+In this method, each developer (or pair) tackles a single problem in serial during their working hours. When the next developer becomes available, the previous one writes a summary of their efforts and progress in a hand-off, synchronously and interactively in a dedicated Slack channel. Once the next developer is caught up, they make progress and hand off to the next, and so on.
 
-> Example: developer A logs in during their morning and works for a few hours on the next phase of a feature implementation. They make some progress on the model, but don't progress the controller beyond some stubs and don't get a chance to touch the view at all. When developer B logs in, developer A shares their progress with a conversation in Slack or Zoom until developer B is confident that they understand the problem's current state, at which point developer B begins working and making commits to the feature branch. Developer B implements the view, correcting and adding some methods to the model as needed. Finally, developer C logs in, and developers A and C pair to write the controller methods. They write a comment on the pull request as they wrap up describing the changes that they've made together. Developer B returns the next day, puts the finishing touches on the tests, writes or refines some documentation on the new code, and merges the pull request.
+> Example: developer A logs in during their morning and works for a few hours on the next phase of a feature implementation. They make some progress on the model, but don't progress the controller beyond some stubs and don't get a chance to touch the view at all. When developer B logs in, developer A shares their progress with a conversation in Slack until developer B is confident that they understand the problem's current state, at which point developer B begins working and making commits to the feature branch. Developer B implements the view, correcting and adding some methods to the model as needed. Finally, developer C logs in, and developers A and C pair to write the controller methods. They update Slack with their progress as they wrap up describing the changes that they've made together. Developer B returns the next day, puts the finishing touches on the tests, writes or refines some documentation on the new code, and merges the pull request.
 
 :+1: _Advantages:_
 
@@ -103,7 +103,7 @@ Use a package configuration setting to control when features under development a
 
 ## All together
 
-Each set of developers who are online synchronously can divide work into Seams. As that set changes when people come online and drop offline, we use Handoffs to pass context along.
+Each set of developers who are online synchronously can divide work into Seams. As that set changes when people come online and drop offline, we use Handoffs to pass context along. Remaining tasking is tracked in a dedicated, loosely-managed feature project linked from the feature request PR.
 
 As we work, we push commits to a common branch, against a common pull request. Depending on the feature under construction, we either Dark Ship code in an early state or hide its entry points behind a Feature Flag.
 

docs/core-team-process.md

@@ -6,10 +6,6 @@ For community contributors -- Please fill out Part 1 of the following template.
 
 # Feature title
 
-## :tipping_hand_woman: Status
-
-Proposed
-
 ## :memo: Summary
 
 One paragraph explanation of the feature.

docs/feature-requests/000-template.md

@@ -80,15 +80,26 @@ This is a high-level overview of the structure of the React component tree that
 > > [`<CommitPreviewItem>`](/lig/items/commit-preview-item.js)
 > > [`<CommitPreviewContainer>`](/lib/containers/commit-preview-container.js)
 > >
-> > The workspace-center pane that appears when looking at _all_ the staged changes that will be going into the next commit.
+> > The workspace-center pane item that appears when looking at _all_ the staged changes that will be going into the next commit.
+> >
+> > > [`<MultiFilePatchController>`](/lib/controllers/multi-file-patch-controller.js)
+> > > [`<MultiFilePatchView>`](/lib/views/multi-file-patch-view.js)
+>
+> > [`<CommitDetailItem>`](/lib/items/issueish-detail-item.js)
+> > [`<CommitDetailContainer>`](/lib/containers/commit-detail-container.js)
+> > [`<CommitDetailController>`](/lib/controllers/commit-detail-controller.js)
+> > [`<CommitDetailView>`](/lib/views/commit-detail-controller.js)
+> >
+> > The workspace-center pane item that appears when looking at all the changes associated with a single commit that already exists in the current branch.
 > >
 > > > [`<MultiFilePatchController>`](/lib/controllers/multi-file-patch-controller.js)
 > > > [`<MultiFilePatchView>`](/lib/views/multi-file-patch-view.js)
 >
 > > [`<IssueishDetailItem>`](/lib/items/issueish-detail-item.js)
 > > [`<IssueishDetailContainer>`](/lib/containers/issueish-detail-container.js)
 > > [`<IssueishDetailController>`](/lib/controllers/issueish-detail-controller.js)
-> > [`<IssueishDetailView>`](/lib/controllers/issueish-detail-controller.js)
+> > [`<IssueDetailView>`](/lib/views/issue-detail-view.js)
+> > [`<PullRequestDetailView>`](/lib/views/pr-detail-view.js)
 > >
 > > The workspace-center pane that displays information about a pull request or issue ("issueish", collectively) from github.com.
 > >
@@ -110,6 +121,13 @@ This is a high-level overview of the structure of the React component tree that
 > > > [`<PrCommitView>`](/lib/views/pr-commit-view.js)
 > > >
 > > > Enumerate the commits associated with a pull request.
+> >
+> > > [`<PullRequestChangedFilesContainer>`](/lib/containers/pr-changed-files-container.js)
+> > >
+> > > Show all the changes, separated by files, introduced in a pull request.
+> > >
+> > > > [`<MultiFilePatchController>`](/lib/controllers/multi-file-patch-controller.js)
+> > > > [`<MultiFilePatchView>`](/lib/views/multi-file-patch-view.js)
 >
 > > [`<InitDialog>`](/lib/views/init-dialog.js)
 > > [`<CloneDialog>`](/lib/views/clone-dialog.js)