Merge branch 'master' of github.com:atom/github into aw-single-project-regression

Author: smashwilson

lib/containers/issueish-lookup-by-number-container.js

@@ -1,21 +1,22 @@
 import React from 'react';
 import Relay from 'react-relay';
+import PropTypes from 'prop-types';
 import {autobind} from 'core-decorators';
 
 import IssueishPaneItemContainer from './issueish-pane-item-container';
 
 export class IssueishLookupByNumber extends React.Component {
   static propTypes = {
-    onTitleChange: React.PropTypes.func.isRequired,
-    query: React.PropTypes.shape({
-      repository: React.PropTypes.object,
+    onTitleChange: PropTypes.func.isRequired,
+    query: PropTypes.shape({
+      repository: PropTypes.object,
     }),
-    relay: React.PropTypes.shape({
-      setVariables: React.PropTypes.func.isRequired,
-      variables: React.PropTypes.shape({
-        repoOwner: React.PropTypes.string.isRequired,
-        repoName: React.PropTypes.string.isRequired,
-        issueishNumber: React.PropTypes.number.isRequired,
+    relay: PropTypes.shape({
+      setVariables: PropTypes.func.isRequired,
+      variables: PropTypes.shape({
+        repoOwner: PropTypes.string.isRequired,
+        repoName: PropTypes.string.isRequired,
+        issueishNumber: PropTypes.number.isRequired,
       }).isRequired,
     }).isRequired,
   }

lib/containers/issueish-pane-item-container.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import Relay from 'react-relay';
+import PropTypes from 'prop-types';
 import cx from 'classnames';
 
 import IssueishTimelineContainer from './issueish-timeline-container';
@@ -23,30 +24,30 @@ const prStateToIcon = {
 
 export class IssueishPaneItemView extends React.Component {
   static propTypes = {
-    switchToIssueish: React.PropTypes.func.isRequired,
-    repository: React.PropTypes.shape({
-      name: React.PropTypes.string.isRequired,
-      owner: React.PropTypes.shape({
-        login: React.PropTypes.string,
+    switchToIssueish: PropTypes.func.isRequired,
+    repository: PropTypes.shape({
+      name: PropTypes.string.isRequired,
+      owner: PropTypes.shape({
+        login: PropTypes.string,
       }),
     }),
-    issueish: React.PropTypes.shape({
-      title: React.PropTypes.string,
-      bodyHTML: React.PropTypes.string,
-      number: React.PropTypes.number,
-      state: React.PropTypes.oneOf([
+    issueish: PropTypes.shape({
+      title: PropTypes.string,
+      bodyHTML: PropTypes.string,
+      number: PropTypes.number,
+      state: PropTypes.oneOf([
         'OPEN', 'CLOSED', 'MERGED',
       ]).isRequired,
-      author: React.PropTypes.shape({
-        login: React.PropTypes.string.isRequired,
-        avatarURL: React.PropTypes.string.isRequired,
-        url: React.PropTypes.string.isRequired,
+      author: PropTypes.shape({
+        login: PropTypes.string.isRequired,
+        avatarURL: PropTypes.string.isRequired,
+        url: PropTypes.string.isRequired,
       }).isRequired,
-      reactionGroups: React.PropTypes.arrayOf(
-        React.PropTypes.shape({
-          content: React.PropTypes.string.isRequired,
-          users: React.PropTypes.shape({
-            totalCount: React.PropTypes.number.isRequired,
+      reactionGroups: PropTypes.arrayOf(
+        PropTypes.shape({
+          content: PropTypes.string.isRequired,
+          users: PropTypes.shape({
+            totalCount: PropTypes.number.isRequired,
           }).isRequired,
         }),
       ).isRequired,