Merge branch 'master' into blender-tweaks

.arclint

@@ -61,7 +61,19 @@
       "type": "spelling"
     },
     "text": {
-      "type": "text"
+      "type": "text",
+      "exclude": [
+        "(^src/(.*/)?__tests__/[^/]+/.*\\.(txt|json))"
+      ]
+    },
+    "text-without-length": {
+      "type": "text",
+      "include": [
+        "(^src/(.*/)?__tests__/[^/]+/.*\\.(txt|json))"
+      ],
+      "severity": {
+        "3": "disabled"
+      }
     },
     "xhpast": {
       "type": "xhpast",

bin/nuance

@@ -0,0 +1 @@
+../scripts/setup/manage_nuance.php

externals/amazon-ses/ses.php

@@ -80,9 +80,30 @@ class SimpleEmailService
   * @return void
   */
   public function __construct($accessKey = null, $secretKey = null, $host = 'email.us-east-1.amazonaws.com') {
+    if (!function_exists('simplexml_load_string')) {
+      throw new Exception(
+        pht(
+          'The PHP SimpleXML extension is not available, but this '.
+          'extension is required to send mail via Amazon SES, because '.
+          'Amazon SES returns API responses in XML format. Install or '.
+          'enable the SimpleXML extension.'));
+    }
+
+    // Catch mistakes with reading the wrong column out of the SES
+    // documentation. See T10728.
+    if (preg_match('(-smtp)', $host)) {
+      throw new Exception(
+        pht(
+          'Amazon SES is not configured correctly: the configured SES '.
+          'endpoint ("%s") is an SMTP endpoint. Instead, use an API (HTTPS) '.
+          'endpoint.',
+          $host));
+    }
+
     if ($accessKey !== null && $secretKey !== null) {
       $this->setAuth($accessKey, $secretKey);
     }
+
     $this->__host = $host;
   }
 
@@ -108,13 +129,6 @@ class SimpleEmailService
     $rest->setParameter('Action', 'ListVerifiedEmailAddresses');
 
     $rest = $rest->getResponse();
-    if($rest->error === false && $rest->code !== 200) {
-      $rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
-    }
-    if($rest->error !== false) {
-      $this->__triggerError('listVerifiedEmailAddresses', $rest->error);
-      return false;
-    }
 
     $response = array();
     if(!isset($rest->body)) {
@@ -148,13 +162,6 @@ class SimpleEmailService
     $rest->setParameter('EmailAddress', $email);
 
     $rest = $rest->getResponse();
-    if($rest->error === false && $rest->code !== 200) {
-      $rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
-    }
-    if($rest->error !== false) {
-      $this->__triggerError('verifyEmailAddress', $rest->error);
-      return false;
-    }
 
     $response['RequestId'] = (string)$rest->body->ResponseMetadata->RequestId;
     return $response;
@@ -172,13 +179,6 @@ class SimpleEmailService
     $rest->setParameter('EmailAddress', $email);
 
     $rest = $rest->getResponse();
-    if($rest->error === false && $rest->code !== 200) {
-      $rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
-    }
-    if($rest->error !== false) {
-      $this->__triggerError('deleteVerifiedEmailAddress', $rest->error);
-      return false;
-    }
 
     $response['RequestId'] = (string)$rest->body->ResponseMetadata->RequestId;
     return $response;
@@ -195,13 +195,6 @@ class SimpleEmailService
     $rest->setParameter('Action', 'GetSendQuota');
 
     $rest = $rest->getResponse();
-    if($rest->error === false && $rest->code !== 200) {
-      $rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
-    }
-    if($rest->error !== false) {
-      $this->__triggerError('getSendQuota', $rest->error);
-      return false;
-    }
 
     $response = array();
     if(!isset($rest->body)) {
@@ -227,13 +220,6 @@ class SimpleEmailService
     $rest->setParameter('Action', 'GetSendStatistics');
 
     $rest = $rest->getResponse();
-    if($rest->error === false && $rest->code !== 200) {
-      $rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
-    }
-    if($rest->error !== false) {
-      $this->__triggerError('getSendStatistics', $rest->error);
-      return false;
-    }
 
     $response = array();
     if(!isset($rest->body)) {
@@ -265,13 +251,6 @@ class SimpleEmailService
     $rest->setParameter('RawMessage.Data', base64_encode($raw));
 
     $rest = $rest->getResponse();
-    if($rest->error === false && $rest->code !== 200) {
-      $rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
-    }
-    if($rest->error !== false) {
-      $this->__triggerError('sendRawEmail', $rest->error);
-      return false;
-    }
 
     $response['MessageId'] = (string)$rest->body->SendEmailResult->MessageId;
     $response['RequestId'] = (string)$rest->body->ResponseMetadata->RequestId;
@@ -351,13 +330,6 @@ class SimpleEmailService
     }
 
     $rest = $rest->getResponse();
-    if($rest->error === false && $rest->code !== 200) {
-      $rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
-    }
-    if($rest->error !== false) {
-      $this->__triggerError('sendEmail', $rest->error);
-      return false;
-    }
 
     $response['MessageId'] = (string)$rest->body->SendEmailResult->MessageId;
     $response['RequestId'] = (string)$rest->body->ResponseMetadata->RequestId;
@@ -523,15 +495,22 @@ final class SimpleEmailServiceRequest
     curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
 
     // Execute, grab errors
-    if (curl_exec($curl)) {
+    if (!curl_exec($curl)) {
-      $this->response->code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+      throw new SimpleEmailServiceException(
-    } else {
+        pht(
-      $this->response->error = array(
+          'Encountered an error while making an HTTP request to Amazon SES '.
-        'curl' => true,
+          '(cURL Error #%d): %s',
-        'code' => curl_errno($curl),
+          curl_errno($curl),
-        'message' => curl_error($curl),
+          curl_error($curl)));
-        'resource' => $this->resource
+    }
-      );
+
+    $this->response->code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+    if ($this->response->code != 200) {
+      throw new SimpleEmailServiceException(
+        pht(
+          'Unexpected HTTP status while making request to Amazon SES: '.
+          'expected 200, got %s.',
+          $this->response->code));
     }
 
     @curl_close($curl);

resources/celerity/map.php

@@ -7,12 +7,12 @@
  */
 return array(
   'names' => array(
-    'core.pkg.css' => 'ef2e7787',
+    'core.pkg.css' => '007bd625',
-    'core.pkg.js' => '7d8faf57',
+    'core.pkg.js' => 'e5484f37',
     'darkconsole.pkg.js' => 'e7393ebb',
-    'differential.pkg.css' => '2de124c9',
+    'differential.pkg.css' => '7ba78475',
     'differential.pkg.js' => 'd0cd0df6',
-    'diffusion.pkg.css' => 'f45955ed',
+    'diffusion.pkg.css' => 'dc8e0cc2',
     'diffusion.pkg.js' => '3a9a8bfa',
     'maniphest.pkg.css' => '4845691a',
     'maniphest.pkg.js' => '949a7498',
@@ -25,7 +25,7 @@ return array(
     'rsrc/css/aphront/notification.css' => '7f684b62',
     'rsrc/css/aphront/panel-view.css' => '8427b78d',
     'rsrc/css/aphront/phabricator-nav-view.css' => 'ac79a758',
-    'rsrc/css/aphront/table-view.css' => '036b6cdc',
+    'rsrc/css/aphront/table-view.css' => '9258e19f',
     'rsrc/css/aphront/tokenizer.css' => '056da01b',
     'rsrc/css/aphront/tooltip.css' => '1a07aea8',
     'rsrc/css/aphront/typeahead-browse.css' => 'd8581d2c',
@@ -54,25 +54,25 @@ return array(
     'rsrc/css/application/contentsource/content-source-view.css' => '4b8b05d4',
     'rsrc/css/application/countdown/timer.css' => '96696f21',
     'rsrc/css/application/daemon/bulk-job.css' => 'df9c1d4a',
-    'rsrc/css/application/dashboard/dashboard.css' => 'eb458607',
+    'rsrc/css/application/dashboard/dashboard.css' => 'bc6f2127',
     'rsrc/css/application/diff/inline-comment-summary.css' => '51efda3a',
     'rsrc/css/application/differential/add-comment.css' => 'c47f8c40',
-    'rsrc/css/application/differential/changeset-view.css' => 'b6b0d1bb',
+    'rsrc/css/application/differential/changeset-view.css' => '3e3b0b76',
-    'rsrc/css/application/differential/core.css' => '7ac3cabc',
+    'rsrc/css/application/differential/core.css' => '5b7b8ff4',
-    'rsrc/css/application/differential/phui-inline-comment.css' => '0fdb3667',
+    'rsrc/css/application/differential/phui-inline-comment.css' => '5953c28e',
     'rsrc/css/application/differential/revision-comment.css' => '14b8565a',
     'rsrc/css/application/differential/revision-history.css' => '0e8eb855',
     'rsrc/css/application/differential/revision-list.css' => 'f3c47d33',
     'rsrc/css/application/differential/table-of-contents.css' => 'ae4b7a55',
-    'rsrc/css/application/diffusion/diffusion-icons.css' => '2941baf1',
+    'rsrc/css/application/diffusion/diffusion-icons.css' => '3311444d',
-    'rsrc/css/application/diffusion/diffusion-readme.css' => '356a4f3c',
+    'rsrc/css/application/diffusion/diffusion-readme.css' => '297373eb',
-    'rsrc/css/application/diffusion/diffusion-source.css' => '075ba788',
+    'rsrc/css/application/diffusion/diffusion-source.css' => '68b30fd3',
     'rsrc/css/application/feed/feed.css' => 'ecd4ec57',
     'rsrc/css/application/files/global-drag-and-drop.css' => '5c1b47c2',
     'rsrc/css/application/flag/flag.css' => '5337623f',
-    'rsrc/css/application/harbormaster/harbormaster.css' => '834879db',
+    'rsrc/css/application/harbormaster/harbormaster.css' => 'f491c9f4',
     'rsrc/css/application/herald/herald-test.css' => 'a52e323e',
-    'rsrc/css/application/herald/herald.css' => '46596280',
+    'rsrc/css/application/herald/herald.css' => 'dc31f6e9',
     'rsrc/css/application/maniphest/batch-editor.css' => 'b0f0b6d5',
     'rsrc/css/application/maniphest/report.css' => '9b9580b7',
     'rsrc/css/application/maniphest/task-edit.css' => 'fda62a9b',
@@ -94,7 +94,7 @@ return array(
     'rsrc/css/application/policy/policy.css' => '957ea14c',
     'rsrc/css/application/ponder/ponder-view.css' => 'fbd45f96',
     'rsrc/css/application/project/project-card-view.css' => '9418c97d',
-    'rsrc/css/application/project/project-view.css' => '9ce99f21',
+    'rsrc/css/application/project/project-view.css' => 'cbaa10a1',
     'rsrc/css/application/releeph/releeph-core.css' => '9b3c5733',
     'rsrc/css/application/releeph/releeph-preview-branch.css' => 'b7a6f4a5',
     'rsrc/css/application/releeph/releeph-request-differential-create-dialog.css' => '8d8b92cd',
@@ -104,7 +104,7 @@ return array(
     'rsrc/css/application/tokens/tokens.css' => '3d0f239e',
     'rsrc/css/application/uiexample/example.css' => '528b19de',
     'rsrc/css/core/core.css' => 'd0801452',
-    'rsrc/css/core/remarkup.css' => 'fc228f08',
+    'rsrc/css/core/remarkup.css' => '2c9ed46f',
     'rsrc/css/core/syntax.css' => '9fd11da8',
     'rsrc/css/core/z-index.css' => '5b6fcf3f',
     'rsrc/css/diviner/diviner-shared.css' => 'aa3656aa',
@@ -123,39 +123,40 @@ return array(
     'rsrc/css/phui/phui-action-panel.css' => '91c7b835',
     'rsrc/css/phui/phui-badge.css' => 'f25c3476',
     'rsrc/css/phui/phui-big-info-view.css' => 'bd903741',
-    'rsrc/css/phui/phui-box.css' => 'c9e01148',
+    'rsrc/css/phui/phui-box.css' => '9c9159a7',
     'rsrc/css/phui/phui-button.css' => 'a64a8de6',
     'rsrc/css/phui/phui-chart.css' => '6bf6f78e',
     'rsrc/css/phui/phui-crumbs-view.css' => '79d536e5',
-    'rsrc/css/phui/phui-document-pro.css' => '92d5b648',
+    'rsrc/css/phui/phui-curtain-view.css' => '7148ae25',
+    'rsrc/css/phui/phui-document-pro.css' => '73e45fd2',
     'rsrc/css/phui/phui-document-summary.css' => '9ca48bdf',
     'rsrc/css/phui/phui-document.css' => '9c71d2bf',
     'rsrc/css/phui/phui-feed-story.css' => '04aec08f',
     'rsrc/css/phui/phui-fontkit.css' => '9cda225e',
-    'rsrc/css/phui/phui-form-view.css' => '61e78dcb',
+    'rsrc/css/phui/phui-form-view.css' => 'c62b9b8c',
     'rsrc/css/phui/phui-form.css' => 'aac1d51d',
-    'rsrc/css/phui/phui-head-thing.css' => '11731da0',
+    'rsrc/css/phui/phui-head-thing.css' => 'fd311e5f',
-    'rsrc/css/phui/phui-header-view.css' => '32e71367',
+    'rsrc/css/phui/phui-header-view.css' => '230254d3',
     'rsrc/css/phui/phui-hovercard.css' => 'de1a2119',
     'rsrc/css/phui/phui-icon-set-selector.css' => '1ab67aad',
     'rsrc/css/phui/phui-icon.css' => '3f33ab57',
     'rsrc/css/phui/phui-image-mask.css' => 'a8498f9c',
     'rsrc/css/phui/phui-info-panel.css' => '27ea50a1',
-    'rsrc/css/phui/phui-info-view.css' => '6d7c3509',
+    'rsrc/css/phui/phui-info-view.css' => '28efab79',
     'rsrc/css/phui/phui-list.css' => '9da2aa00',
-    'rsrc/css/phui/phui-object-box.css' => '91628842',
+    'rsrc/css/phui/phui-object-box.css' => '6b487c57',
-    'rsrc/css/phui/phui-object-item-list-view.css' => '94abc3d5',
+    'rsrc/css/phui/phui-object-item-list-view.css' => '2fd9e633',
     'rsrc/css/phui/phui-pager.css' => 'bea33d23',
     'rsrc/css/phui/phui-pinboard-view.css' => '2495140e',
     'rsrc/css/phui/phui-profile-menu.css' => '7e92a89a',
-    'rsrc/css/phui/phui-property-list-view.css' => '27b2849e',
+    'rsrc/css/phui/phui-property-list-view.css' => '1d42ee7c',
     'rsrc/css/phui/phui-remarkup-preview.css' => '1a8f2591',
     'rsrc/css/phui/phui-segment-bar-view.css' => '46342871',
     'rsrc/css/phui/phui-spacing.css' => '042804d6',
     'rsrc/css/phui/phui-status.css' => '37309046',
     'rsrc/css/phui/phui-tag-view.css' => '6bbd83e2',
-    'rsrc/css/phui/phui-timeline-view.css' => '2efceff8',
+    'rsrc/css/phui/phui-timeline-view.css' => '6e342216',
-    'rsrc/css/phui/phui-two-column-view.css' => 'ecd7ec62',
+    'rsrc/css/phui/phui-two-column-view.css' => '691fec04',
     'rsrc/css/phui/workboards/phui-workboard-color.css' => 'ac6fe6a7',
     'rsrc/css/phui/workboards/phui-workboard.css' => 'e6d89647',
     'rsrc/css/phui/workboards/phui-workcard.css' => '3646fb96',
@@ -245,7 +246,7 @@ return array(
     'rsrc/externals/javelin/lib/URI.js' => 'c989ade3',
     'rsrc/externals/javelin/lib/Vector.js' => '2caa8fb8',
     'rsrc/externals/javelin/lib/WebSocket.js' => 'e292eaf4',
-    'rsrc/externals/javelin/lib/Workflow.js' => '5b2e3e2b',
+    'rsrc/externals/javelin/lib/Workflow.js' => '28cfbdd0',
     'rsrc/externals/javelin/lib/__tests__/Cookie.js' => '5ed109e8',
     'rsrc/externals/javelin/lib/__tests__/DOM.js' => 'c984504b',
     'rsrc/externals/javelin/lib/__tests__/JSON.js' => '837a7d68',
@@ -274,6 +275,7 @@ return array(
     'rsrc/image/checker_dark.png' => 'd8e65881',
     'rsrc/image/checker_light.png' => 'a0155918',
     'rsrc/image/checker_lighter.png' => 'd5da91b6',
+    'rsrc/image/d5d8e1.png' => '0c2a1497',
     'rsrc/image/darkload.gif' => '1ffd3ec6',
     'rsrc/image/divot.png' => '94dded62',
     'rsrc/image/examples/hero.png' => '979a86ae',
@@ -401,7 +403,7 @@ return array(
     'rsrc/js/application/drydock/drydock-live-operation-status.js' => '901935ef',
     'rsrc/js/application/files/behavior-icon-composer.js' => '8499b6ab',
     'rsrc/js/application/files/behavior-launch-icon-composer.js' => '48086888',
-    'rsrc/js/application/herald/HeraldRuleEditor.js' => '746ca158',
+    'rsrc/js/application/herald/HeraldRuleEditor.js' => 'd6a7e717',
     'rsrc/js/application/herald/PathTypeahead.js' => 'f7fc67ec',
     'rsrc/js/application/herald/herald-rule-editor.js' => '7ebaeed3',
     'rsrc/js/application/maniphest/behavior-batch-editor.js' => '782ab6e7',
@@ -421,7 +423,7 @@ return array(
     'rsrc/js/application/policy/behavior-policy-rule-editor.js' => '5e9f347c',
     'rsrc/js/application/projects/WorkboardBoard.js' => '52291776',
     'rsrc/js/application/projects/WorkboardCard.js' => 'c587b80f',
-    'rsrc/js/application/projects/WorkboardColumn.js' => 'f05d6e5d',
+    'rsrc/js/application/projects/WorkboardColumn.js' => 'bae58312',
     'rsrc/js/application/projects/WorkboardController.js' => '55baf5ed',
     'rsrc/js/application/projects/behavior-project-boards.js' => '14a1faae',
     'rsrc/js/application/projects/behavior-project-create.js' => '065227cc',
@@ -433,7 +435,7 @@ return array(
     'rsrc/js/application/search/behavior-reorder-profile-menu-items.js' => 'e2e0a072',
     'rsrc/js/application/search/behavior-reorder-queries.js' => 'e9581f08',
     'rsrc/js/application/slowvote/behavior-slowvote-embed.js' => '887ad43f',
-    'rsrc/js/application/transactions/behavior-comment-actions.js' => '1f2fcaf8',
+    'rsrc/js/application/transactions/behavior-comment-actions.js' => '06460e71',
     'rsrc/js/application/transactions/behavior-reorder-configs.js' => 'd7a74243',
     'rsrc/js/application/transactions/behavior-reorder-fields.js' => 'b59e1e96',
     'rsrc/js/application/transactions/behavior-show-older-transactions.js' => 'dbbf48b6',
@@ -526,7 +528,7 @@ return array(
     'aphront-list-filter-view-css' => '5d6f0526',
     'aphront-multi-column-view-css' => 'fd18389d',
     'aphront-panel-view-css' => '8427b78d',
-    'aphront-table-view-css' => '036b6cdc',
+    'aphront-table-view-css' => '9258e19f',
     'aphront-tokenizer-control-css' => '056da01b',
     'aphront-tooltip-css' => '1a07aea8',
     'aphront-typeahead-control-css' => 'd4f16145',
@@ -545,25 +547,25 @@ return array(
     'conpherence-update-css' => 'faf6be09',
     'conpherence-widget-pane-css' => '775eaaba',
     'd3' => 'a11a5ff2',
-    'differential-changeset-view-css' => 'b6b0d1bb',
+    'differential-changeset-view-css' => '3e3b0b76',
-    'differential-core-view-css' => '7ac3cabc',
+    'differential-core-view-css' => '5b7b8ff4',
     'differential-inline-comment-editor' => '64a5550f',
     'differential-revision-add-comment-css' => 'c47f8c40',
     'differential-revision-comment-css' => '14b8565a',
     'differential-revision-history-css' => '0e8eb855',
     'differential-revision-list-css' => 'f3c47d33',
     'differential-table-of-contents-css' => 'ae4b7a55',
-    'diffusion-icons-css' => '2941baf1',
+    'diffusion-icons-css' => '3311444d',
-    'diffusion-readme-css' => '356a4f3c',
+    'diffusion-readme-css' => '297373eb',
-    'diffusion-source-css' => '075ba788',
+    'diffusion-source-css' => '68b30fd3',
     'diviner-shared-css' => 'aa3656aa',
     'font-aleo' => '8bdb2835',
     'font-fontawesome' => 'c43323c5',
     'font-lato' => 'c7ccd872',
     'global-drag-and-drop-css' => '5c1b47c2',
-    'harbormaster-css' => '834879db',
+    'harbormaster-css' => 'f491c9f4',
-    'herald-css' => '46596280',
+    'herald-css' => 'dc31f6e9',
-    'herald-rule-editor' => '746ca158',
+    'herald-rule-editor' => 'd6a7e717',
     'herald-test-css' => 'a52e323e',
     'inline-comment-summary-css' => '51efda3a',
     'javelin-aphlict' => '5359e785',
@@ -580,7 +582,7 @@ return array(
     'javelin-behavior-audit-preview' => 'd835b03a',
     'javelin-behavior-bulk-job-reload' => 'edf8a145',
     'javelin-behavior-choose-control' => '327a00d1',
-    'javelin-behavior-comment-actions' => '1f2fcaf8',
+    'javelin-behavior-comment-actions' => '06460e71',
     'javelin-behavior-config-reorder-fields' => 'b6993408',
     'javelin-behavior-conpherence-drag-and-drop-photo' => 'cf86d16a',
     'javelin-behavior-conpherence-menu' => '1d45c74d',
@@ -732,9 +734,9 @@ return array(
     'javelin-websocket' => 'e292eaf4',
     'javelin-workboard-board' => '52291776',
     'javelin-workboard-card' => 'c587b80f',
-    'javelin-workboard-column' => 'f05d6e5d',
+    'javelin-workboard-column' => 'bae58312',
     'javelin-workboard-controller' => '55baf5ed',
-    'javelin-workflow' => '5b2e3e2b',
+    'javelin-workflow' => '28cfbdd0',
     'lightbox-attachment-css' => '7acac05d',
     'maniphest-batch-editor' => 'b0f0b6d5',
     'maniphest-report-css' => '9b9580b7',
@@ -753,7 +755,7 @@ return array(
     'phabricator-content-source-view-css' => '4b8b05d4',
     'phabricator-core-css' => 'd0801452',
     'phabricator-countdown-css' => '96696f21',
-    'phabricator-dashboard-css' => 'eb458607',
+    'phabricator-dashboard-css' => 'bc6f2127',
     'phabricator-drag-and-drop-file-upload' => '81f182b5',
     'phabricator-draggable-list' => '5a13c79f',
     'phabricator-fatal-config-template-css' => '8e6c6fcd',
@@ -771,7 +773,7 @@ return array(
     'phabricator-object-selector-css' => '85ee8ce6',
     'phabricator-phtize' => 'd254d646',
     'phabricator-prefab' => 'e67df814',
-    'phabricator-remarkup-css' => 'fc228f08',
+    'phabricator-remarkup-css' => '2c9ed46f',
     'phabricator-search-results-css' => '7dea472c',
     'phabricator-shaped-request' => '7cbe244b',
     'phabricator-side-menu-view-css' => '3a3d9f41',
@@ -806,7 +808,7 @@ return array(
     'phui-action-panel-css' => '91c7b835',
     'phui-badge-view-css' => 'f25c3476',
     'phui-big-info-view-css' => 'bd903741',
-    'phui-box-css' => 'c9e01148',
+    'phui-box-css' => '9c9159a7',
     'phui-button-css' => 'a64a8de6',
     'phui-calendar-css' => 'ccabe893',
     'phui-calendar-day-css' => 'd1cf6f93',
@@ -814,39 +816,40 @@ return array(
     'phui-calendar-month-css' => '476be7e0',
     'phui-chart-css' => '6bf6f78e',
     'phui-crumbs-view-css' => '79d536e5',
+    'phui-curtain-view-css' => '7148ae25',
     'phui-document-summary-view-css' => '9ca48bdf',
     'phui-document-view-css' => '9c71d2bf',
-    'phui-document-view-pro-css' => '92d5b648',
+    'phui-document-view-pro-css' => '73e45fd2',
     'phui-feed-story-css' => '04aec08f',
     'phui-font-icon-base-css' => '6449bce8',
     'phui-fontkit-css' => '9cda225e',
     'phui-form-css' => 'aac1d51d',
-    'phui-form-view-css' => '61e78dcb',
+    'phui-form-view-css' => 'c62b9b8c',
-    'phui-head-thing-view-css' => '11731da0',
+    'phui-head-thing-view-css' => 'fd311e5f',
-    'phui-header-view-css' => '32e71367',
+    'phui-header-view-css' => '230254d3',
     'phui-hovercard' => '1bd28176',
     'phui-hovercard-view-css' => 'de1a2119',
     'phui-icon-set-selector-css' => '1ab67aad',
     'phui-icon-view-css' => '3f33ab57',
     'phui-image-mask-css' => 'a8498f9c',
     'phui-info-panel-css' => '27ea50a1',
-    'phui-info-view-css' => '6d7c3509',
+    'phui-info-view-css' => '28efab79',
-    'phui-inline-comment-view-css' => '0fdb3667',
+    'phui-inline-comment-view-css' => '5953c28e',
     'phui-list-view-css' => '9da2aa00',
-    'phui-object-box-css' => '91628842',
+    'phui-object-box-css' => '6b487c57',
-    'phui-object-item-list-view-css' => '94abc3d5',
+    'phui-object-item-list-view-css' => '2fd9e633',
     'phui-pager-css' => 'bea33d23',
     'phui-pinboard-view-css' => '2495140e',
     'phui-profile-menu-css' => '7e92a89a',
-    'phui-property-list-view-css' => '27b2849e',
+    'phui-property-list-view-css' => '1d42ee7c',
     'phui-remarkup-preview-css' => '1a8f2591',
     'phui-segment-bar-view-css' => '46342871',
     'phui-spacing-css' => '042804d6',
     'phui-status-list-view-css' => '37309046',
     'phui-tag-view-css' => '6bbd83e2',
     'phui-theme-css' => '027ba77e',
-    'phui-timeline-view-css' => '2efceff8',
+    'phui-timeline-view-css' => '6e342216',
-    'phui-two-column-view-css' => 'ecd7ec62',
+    'phui-two-column-view-css' => '691fec04',
     'phui-workboard-color-css' => 'ac6fe6a7',
     'phui-workboard-view-css' => 'e6d89647',
     'phui-workcard-view-css' => '3646fb96',
@@ -862,7 +865,7 @@ return array(
     'policy-transaction-detail-css' => '82100a43',
     'ponder-view-css' => 'fbd45f96',
     'project-card-view-css' => '9418c97d',
-    'project-view-css' => '9ce99f21',
+    'project-view-css' => 'cbaa10a1',
     'releeph-core' => '9b3c5733',
     'releeph-preview-branch' => 'b7a6f4a5',
     'releeph-request-differential-create-dialog' => '8d8b92cd',
@@ -920,6 +923,15 @@ return array(
       'aphront-typeahead-control-css',
       'phui-tag-view-css',
     ),
+    '06460e71' => array(
+      'javelin-behavior',
+      'javelin-stratcom',
+      'javelin-workflow',
+      'javelin-dom',
+      'phuix-form-control-view',
+      'phuix-icon-view',
+      'javelin-behavior-phabricator-gesture',
+    ),
     '065227cc' => array(
       'javelin-behavior',
       'javelin-dom',
@@ -1025,15 +1037,6 @@ return array(
       'javelin-dom',
       'javelin-reactor-dom',
     ),
-    '1f2fcaf8' => array(
-      'javelin-behavior',
-      'javelin-stratcom',
-      'javelin-workflow',
-      'javelin-dom',
-      'phuix-form-control-view',
-      'phuix-icon-view',
-      'javelin-behavior-phabricator-gesture',
-    ),
     '21ba5861' => array(
       'javelin-behavior',
       'javelin-dom',
@@ -1059,6 +1062,17 @@ return array(
       'phabricator-drag-and-drop-file-upload',
       'phabricator-draggable-list',
     ),
+    '28cfbdd0' => array(
+      'javelin-stratcom',
+      'javelin-request',
+      'javelin-dom',
+      'javelin-vector',
+      'javelin-install',
+      'javelin-util',
+      'javelin-mask',
+      'javelin-uri',
+      'javelin-routable',
+    ),
     '2926fff2' => array(
       'javelin-behavior',
       'javelin-dom',
@@ -1124,6 +1138,9 @@ return array(
       'javelin-util',
       'javelin-uri',
     ),
+    '3e3b0b76' => array(
+      'phui-inline-comment-view-css',
+    ),
     '3f5d6dbf' => array(
       'javelin-behavior',
       'javelin-dom',
@@ -1309,17 +1326,6 @@ return array(
       'javelin-vector',
       'javelin-magical-init',
     ),
-    '5b2e3e2b' => array(
-      'javelin-stratcom',
-      'javelin-request',
-      'javelin-dom',
-      'javelin-vector',
-      'javelin-install',
-      'javelin-util',
-      'javelin-mask',
-      'javelin-uri',
-      'javelin-routable',
-    ),
     '5c54cbf3' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -1432,15 +1438,6 @@ return array(
       'javelin-vector',
       'javelin-dom',
     ),
-    '746ca158' => array(
-      'multirow-row-manager',
-      'javelin-install',
-      'javelin-util',
-      'javelin-dom',
-      'javelin-stratcom',
-      'javelin-json',
-      'phabricator-prefab',
-    ),
     '76b9fc3e' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -1791,8 +1788,9 @@ return array(
       'javelin-json',
       'phabricator-draggable-list',
     ),
-    'b6b0d1bb' => array(
+    'bae58312' => array(
-      'phui-inline-comment-view-css',
+      'javelin-install',
+      'javelin-workboard-card',
     ),
     'bcaccd64' => array(
       'javelin-behavior',
@@ -1919,6 +1917,15 @@ return array(
       'javelin-dom',
       'javelin-stratcom',
     ),
+    'd6a7e717' => array(
+      'multirow-row-manager',
+      'javelin-install',
+      'javelin-util',
+      'javelin-dom',
+      'javelin-stratcom',
+      'javelin-json',
+      'phabricator-prefab',
+    ),
     'd75709e6' => array(
       'javelin-behavior',
       'javelin-workflow',
@@ -2062,10 +2069,6 @@ return array(
       'javelin-workflow',
       'javelin-json',
     ),
-    'f05d6e5d' => array(
-      'javelin-install',
-      'javelin-workboard-card',
-    ),
     'f411b6ae' => array(
       'javelin-behavior',
       'javelin-stratcom',

resources/sql/autopatches/20140211.dx.2.migcommenttext.php

@@ -4,8 +4,7 @@ $conn_w = id(new DifferentialRevision())->establishConnection('w');
 $rows = new LiskRawMigrationIterator($conn_w, 'differential_comment');
 
 $content_source = PhabricatorContentSource::newForSource(
-  PhabricatorContentSource::SOURCE_LEGACY,
+  PhabricatorOldWorldContentSource::SOURCECONST)->serialize();
-  array())->serialize();
 
 echo pht('Migrating Differential comment text to modern storage...')."\n";
 foreach ($rows as $row) {

resources/sql/autopatches/20140212.dx.1.armageddon.php

@@ -4,8 +4,7 @@ $conn_w = id(new DifferentialRevision())->establishConnection('w');
 $rows = new LiskRawMigrationIterator($conn_w, 'differential_comment');
 
 $content_source = PhabricatorContentSource::newForSource(
-  PhabricatorContentSource::SOURCE_LEGACY,
+  PhabricatorOldWorldContentSource::SOURCECONST)->serialize();
-  array())->serialize();
 
 echo pht('Migrating Differential comments to modern storage...')."\n";
 foreach ($rows as $row) {

resources/sql/autopatches/20140722.audit.3.miginlines.php

@@ -10,8 +10,7 @@ $dst_table = 'audit_transaction_comment';
 echo pht('Migrating Audit inline comments to new format...')."\n";
 
 $content_source = PhabricatorContentSource::newForSource(
-  PhabricatorContentSource::SOURCE_LEGACY,
+  PhabricatorOldWorldContentSource::SOURCECONST)->serialize();
-  array())->serialize();
 
 $rows = new LiskRawMigrationIterator($conn_w, $src_table);
 foreach ($rows as $row) {

resources/sql/autopatches/20140722.audit.4.migtext.php

@@ -4,8 +4,7 @@ $conn_w = id(new PhabricatorAuditTransaction())->establishConnection('w');
 $rows = new LiskRawMigrationIterator($conn_w, 'audit_comment');
 
 $content_source = PhabricatorContentSource::newForSource(
-  PhabricatorContentSource::SOURCE_LEGACY,
+  PhabricatorOldWorldContentSource::SOURCECONST)->serialize();
-  array())->serialize();
 
 echo pht('Migrating Audit comment text to modern storage...')."\n";
 foreach ($rows as $row) {

resources/sql/autopatches/20140725.audit.1.migxactions.php

@@ -4,8 +4,7 @@ $conn_w = id(new PhabricatorAuditTransaction())->establishConnection('w');
 $rows = new LiskRawMigrationIterator($conn_w, 'audit_comment');
 
 $content_source = PhabricatorContentSource::newForSource(
-  PhabricatorContentSource::SOURCE_LEGACY,
+  PhabricatorOldWorldContentSource::SOURCECONST)->serialize();
-  array())->serialize();
 
 echo pht('Migrating Audit comments to modern storage...')."\n";
 foreach ($rows as $row) {

resources/sql/autopatches/20160102.badges.award.sql

@@ -0,0 +1,10 @@
+CREATE TABLE {$NAMESPACE}_badges.badges_award (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  badgePHID VARBINARY(64) NOT NULL,
+  recipientPHID VARBINARY(64) NOT NULL,
+  awarderPHID varbinary(64) NOT NULL,
+  dateCreated INT UNSIGNED NOT NULL,
+  dateModified INT UNSIGNED NOT NULL,
+  UNIQUE KEY `key_badge` (badgePHID, recipientPHID),
+  KEY `key_recipient` (recipientPHID)
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};

resources/sql/autopatches/20160308.nuance.01.disabled.sql

@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_nuance.nuance_source
+  ADD isDisabled BOOL NOT NULL;

resources/sql/autopatches/20160308.nuance.02.cursordata.sql

@@ -0,0 +1,12 @@
+CREATE TABLE {$NAMESPACE}_nuance.nuance_importcursordata (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  phid VARBINARY(64) NOT NULL,
+  sourcePHID VARBINARY(64) NOT NULL,
+  cursorKey VARCHAR(32) NOT NULL COLLATE {$COLLATE_TEXT},
+  cursorType VARCHAR(32) NOT NULL COLLATE {$COLLATE_TEXT},
+  properties LONGTEXT NOT NULL COLLATE {$COLLATE_TEXT},
+  dateCreated INT UNSIGNED NOT NULL,
+  dateModified INT UNSIGNED NOT NULL,
+  UNIQUE KEY `key_phid` (phid),
+  UNIQUE KEY `key_source` (sourcePHID, cursorKey)
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};

resources/sql/autopatches/20160308.nuance.03.sourcen.sql

@@ -0,0 +1,7 @@
+CREATE TABLE {$NAMESPACE}_nuance.nuance_sourcename_ngrams (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  objectID INT UNSIGNED NOT NULL,
+  ngram CHAR(3) NOT NULL COLLATE {$COLLATE_TEXT},
+  KEY `key_object` (objectID),
+  KEY `key_ngram` (ngram, objectID)
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};

resources/sql/autopatches/20160308.nuance.04.sourcei.php

@@ -0,0 +1,11 @@
+<?php
+
+$table = new NuanceSource();
+
+foreach (new LiskMigrationIterator($table) as $source) {
+  PhabricatorSearchWorker::queueDocumentForIndexing(
+    $source->getPHID(),
+    array(
+      'force' => true,
+    ));
+}

resources/sql/autopatches/20160308.nuance.05.sourcename.sql

@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_nuance.nuance_source
+  CHANGE name name VARCHAR(255) NOT NULL COLLATE {$COLLATE_SORT};

resources/sql/autopatches/20160308.nuance.06.label.sql

@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_nuance.nuance_item
+  DROP sourceLabel;

resources/sql/autopatches/20160308.nuance.07.itemtype.sql

@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_nuance.nuance_item
+  ADD itemType VARCHAR(64) NOT NULL COLLATE {$COLLATE_TEXT};

resources/sql/autopatches/20160308.nuance.08.itemkey.sql

@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_nuance.nuance_item
+  ADD itemKey VARCHAR(64) NOT NULL COLLATE {$COLLATE_TEXT};

resources/sql/autopatches/20160308.nuance.09.itemcontainer.sql

@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_nuance.nuance_item
+  ADD itemContainerKey VARCHAR(64) COLLATE {$COLLATE_TEXT};

resources/sql/autopatches/20160308.nuance.10.itemkeyu.sql

@@ -0,0 +1,2 @@
+UPDATE {$NAMESPACE}_nuance.nuance_item
+  SET itemKey = id WHERE itemKey = '';

resources/sql/autopatches/20160308.nuance.11.requestor.sql

@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_nuance.nuance_item
+  CHANGE requestorPHID requestorPHID VARBINARY(64);

resources/sql/autopatches/20160308.nuance.12.queue.sql

@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_nuance.nuance_item
+  CHANGE queuePHID queuePHID VARBINARY(64);

resources/sql/autopatches/20160316.lfs.01.token.resource.sql

@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_auth.auth_temporarytoken
+  CHANGE objectPHID tokenResource VARBINARY(64) NOT NULL;

resources/sql/autopatches/20160316.lfs.02.token.user.sql

@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_auth.auth_temporarytoken
+  ADD userPHID VARBINARY(64);

resources/sql/autopatches/20160316.lfs.03.token.properties.sql

@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_auth.auth_temporarytoken
+  ADD properties LONGTEXT NOT NULL COLLATE {$COLLATE_TEXT};

resources/sql/autopatches/20160316.lfs.04.token.default.sql

@@ -0,0 +1,2 @@
+UPDATE {$NAMESPACE}_auth.auth_temporarytoken
+  SET properties = '{}' WHERE properties = '';

resources/sql/autopatches/20160317.lfs.01.ref.sql

@@ -0,0 +1,11 @@
+CREATE TABLE {$NAMESPACE}_repository.repository_gitlfsref (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  repositoryPHID VARBINARY(64) NOT NULL,
+  objectHash BINARY(64) NOT NULL,
+  byteSize BIGINT UNSIGNED NOT NULL,
+  authorPHID VARBINARY(64) NOT NULL,
+  filePHID VARBINARY(64) NOT NULL,
+  dateCreated INT UNSIGNED NOT NULL,
+  dateModified INT UNSIGNED NOT NULL,
+  UNIQUE KEY `key_hash` (repositoryPHID, objectHash)
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};

resources/sql/autopatches/20160321.nuance.01.taskbridge.sql

@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_maniphest.maniphest_task
+  ADD bridgedObjectPHID VARBINARY(64);

resources/sql/autopatches/20160322.nuance.01.itemcommand.sql

@@ -0,0 +1,8 @@
+CREATE TABLE {$NAMESPACE}_nuance.nuance_itemcommand (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  itemPHID VARBINARY(64) NOT NULL,
+  authorPHID VARBINARY(64) NOT NULL,
+  command VARCHAR(64) NOT NULL COLLATE {$COLLATE_TEXT},
+  parameters LONGTEXT NOT NULL COLLATE {$COLLATE_TEXT},
+  KEY `key_item` (itemPHID)
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};

resources/sql/autopatches/20160323.badgemigrate.sql

@@ -0,0 +1,6 @@
+/* PhabricatorBadgeHasRecipientEdgeType::TYPECONST = 59 */
+
+INSERT IGNORE INTO {$NAMESPACE}_badges.badges_award
+  (badgePHID, recipientPHID, awarderPHID, dateCreated, dateModified)
+  SELECT src, dst, 'PHID-VOID-00000000000000000000', dateCreated, dateCreated
+    FROM {$NAMESPACE}_badges.edge WHERE type = 59;

resources/sql/autopatches/20160329.nuance.01.requestor.sql

@@ -0,0 +1 @@
+DROP TABLE IF EXISTS {$NAMESPACE}_nuance.nuance_requestor;

resources/sql/autopatches/20160329.nuance.02.requestorsource.sql

@@ -0,0 +1 @@
+DROP TABLE IF EXISTS {$NAMESPACE}_nuance.nuance_requestorsource;

resources/sql/autopatches/20160329.nuance.03.requestorxaction.sql

@@ -0,0 +1 @@
+DROP TABLE IF EXISTS {$NAMESPACE}_nuance.nuance_requestortransaction;

resources/sql/autopatches/20160329.nuance.04.requestorcomment.sql

@@ -0,0 +1 @@
+DROP TABLE IF EXISTS {$NAMESPACE}_nuance.nuance_requestortransaction_comment;

resources/sql/autopatches/20160330.badges.migratequality.sql

@@ -0,0 +1,32 @@
+/* Change quality from color to int */
+
+UPDATE {$NAMESPACE}_badges.badges_badge
+  SET quality = 140
+  WHERE quality = 'grey';
+
+UPDATE {$NAMESPACE}_badges.badges_badge
+  SET quality = 120
+  WHERE quality = 'white';
+
+UPDATE {$NAMESPACE}_badges.badges_badge
+  SET quality = 100
+  WHERE quality = 'green';
+
+UPDATE {$NAMESPACE}_badges.badges_badge
+  SET quality = 80
+  WHERE quality = 'blue';
+
+UPDATE {$NAMESPACE}_badges.badges_badge
+  SET quality = 60
+  WHERE quality = 'indigo';
+
+UPDATE {$NAMESPACE}_badges.badges_badge
+  SET quality = 40
+  WHERE quality = 'orange';
+
+UPDATE {$NAMESPACE}_badges.badges_badge
+  SET quality = 20
+  WHERE quality = 'yellow';
+
+ALTER TABLE {$NAMESPACE}_badges.badges_badge
+  MODIFY quality INT UNSIGNED NOT NULL;

resources/sql/autopatches/20160330.badges.qualityxaction.mig.sql

@@ -0,0 +1,59 @@
+/* Migrate old badge quality transactions */
+
+UPDATE {$NAMESPACE}_badges.badges_transaction
+  SET oldValue = 140
+  WHERE oldValue = '"grey"' AND transactionType = 'badges:quality';
+
+UPDATE {$NAMESPACE}_badges.badges_transaction
+  SET oldValue = 120
+  WHERE oldValue = '"white"' AND transactionType = 'badges:quality';
+
+UPDATE {$NAMESPACE}_badges.badges_transaction
+  SET oldValue = 100
+  WHERE oldValue = '"green"' AND transactionType = 'badges:quality';
+
+UPDATE {$NAMESPACE}_badges.badges_transaction
+  SET oldValue = 80
+  WHERE oldValue = '"blue"' AND transactionType = 'badges:quality';
+
+UPDATE {$NAMESPACE}_badges.badges_transaction
+  SET oldValue = 60
+  WHERE oldValue = '"indigo"' AND transactionType = 'badges:quality';
+
+UPDATE {$NAMESPACE}_badges.badges_transaction
+  SET oldValue = 40
+  WHERE oldValue = '"orange"' AND transactionType = 'badges:quality';
+
+UPDATE {$NAMESPACE}_badges.badges_transaction
+  SET oldValue = 20
+  WHERE oldValue = '"yellow"' AND transactionType = 'badges:quality';
+
+
+
+UPDATE {$NAMESPACE}_badges.badges_transaction
+  SET newValue = 140
+  WHERE newValue = '"grey"' AND transactionType = 'badges:quality';
+
+UPDATE {$NAMESPACE}_badges.badges_transaction
+  SET newValue = 120
+  WHERE newValue = '"white"' AND transactionType = 'badges:quality';
+
+UPDATE {$NAMESPACE}_badges.badges_transaction
+  SET newValue = 100
+  WHERE newValue = '"green"' AND transactionType = 'badges:quality';
+
+UPDATE {$NAMESPACE}_badges.badges_transaction
+  SET newValue = 80
+  WHERE newValue = '"blue"' AND transactionType = 'badges:quality';
+
+UPDATE {$NAMESPACE}_badges.badges_transaction
+  SET newValue = 60
+  WHERE newValue = '"indigo"' AND transactionType = 'badges:quality';
+
+UPDATE {$NAMESPACE}_badges.badges_transaction
+  SET newValue = 40
+  WHERE newValue = '"orange"' AND transactionType = 'badges:quality';
+
+UPDATE {$NAMESPACE}_badges.badges_transaction
+  SET newValue = 20
+  WHERE newValue = '"yellow"' AND transactionType = 'badges:quality';

resources/sql/autopatches/20160331.fund.comments.1.sql

@@ -0,0 +1,18 @@
+CREATE TABLE {$NAMESPACE}_fund.fund_initiativetransaction_comment (
+  id INT UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
+  phid VARCHAR(64) NOT NULL,
+  transactionPHID VARCHAR(64),
+  authorPHID VARCHAR(64) NOT NULL,
+  viewPolicy VARCHAR(64) NOT NULL,
+  editPolicy VARCHAR(64) NOT NULL,
+  commentVersion INT UNSIGNED NOT NULL,
+  content LONGTEXT NOT NULL COLLATE {$COLLATE_TEXT},
+  contentSource LONGTEXT NOT NULL COLLATE {$COLLATE_TEXT},
+  isDeleted BOOL NOT NULL,
+  dateCreated INT UNSIGNED NOT NULL,
+  dateModified INT UNSIGNED NOT NULL,
+
+  UNIQUE KEY `key_phid` (phid),
+  UNIQUE KEY `key_version` (transactionPHID, commentVersion)
+
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};

resources/sql/autopatches/20160404.oauth.1.xaction.sql

@@ -0,0 +1,19 @@
+CREATE TABLE {$NAMESPACE}_oauth_server.oauth_server_transaction (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  phid VARBINARY(64) NOT NULL,
+  authorPHID VARBINARY(64) NOT NULL,
+  objectPHID VARBINARY(64) NOT NULL,
+  viewPolicy VARBINARY(64) NOT NULL,
+  editPolicy VARBINARY(64) NOT NULL,
+  commentPHID VARBINARY(64) DEFAULT NULL,
+  commentVersion INT UNSIGNED NOT NULL,
+  transactionType VARCHAR(32) COLLATE {$COLLATE_TEXT} NOT NULL,
+  oldValue LONGTEXT COLLATE {$COLLATE_TEXT} NOT NULL,
+  newValue LONGTEXT COLLATE {$COLLATE_TEXT} NOT NULL,
+  contentSource LONGTEXT COLLATE {$COLLATE_TEXT} NOT NULL,
+  metadata LONGTEXT COLLATE {$COLLATE_TEXT} NOT NULL,
+  dateCreated INT UNSIGNED NOT NULL,
+  dateModified INT UNSIGNED NOT NULL,
+  UNIQUE KEY `key_phid` (`phid`),
+  KEY `key_object` (`objectPHID`)
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};

resources/sql/autopatches/20160405.oauth.2.disable.sql

@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_oauth_server.oauth_server_oauthserverclient
+  ADD isDisabled BOOL NOT NULL;

resources/sql/patches/20130715.votecomments.php

@@ -46,9 +46,8 @@ foreach ($comments as $comment) {
     PhabricatorApplicationTransactionTransactionPHIDType::TYPECONST,
     PhabricatorSlowvotePollPHIDType::TYPECONST);
 
-  $source = PhabricatorContentSource::newForSource(
+  $content_source = PhabricatorContentSource::newForSource(
-    PhabricatorContentSource::SOURCE_LEGACY,
+    PhabricatorOldWorldContentSource::SOURCECONST)->serialize();
-    array())->serialize();
 
   queryfx(
     $conn_w,

resources/sql/patches/20130728.ponderxcomment.php

@@ -49,8 +49,7 @@ foreach ($rows as $row) {
     1,
     $row['content'],
     PhabricatorContentSource::newForSource(
-      PhabricatorContentSource::SOURCE_LEGACY,
+      PhabricatorOldWorldContentSource::SOURCECONST)->serialize(),
-      array())->serialize(),
     0,
     $row['dateCreated'],
     $row['dateModified']);
@@ -73,8 +72,7 @@ foreach ($rows as $row) {
     'null',
     'null',
     PhabricatorContentSource::newForSource(
-      PhabricatorContentSource::SOURCE_LEGACY,
+      PhabricatorOldWorldContentSource::SOURCECONST)->serialize(),
-      array())->serialize(),
     '[]',
     $row['dateCreated'],
     $row['dateModified']);

resources/sql/patches/20130801.pastexactions.php

@@ -34,8 +34,7 @@ foreach ($rows as $row) {
     'null',
     $row['filePHID'],
     PhabricatorContentSource::newForSource(
-      PhabricatorContentSource::SOURCE_LEGACY,
+      PhabricatorOldWorldContentSource::SOURCECONST)->serialize(),
-      array())->serialize(),
     '[]',
     $row['dateCreated'],
     $row['dateCreated'],

resources/sql/patches/20130926.dinline.php

@@ -10,8 +10,7 @@ $dst_table = 'differential_transaction_comment';
 echo pht('Migrating Differential inline comments to new format...')."\n";
 
 $content_source = PhabricatorContentSource::newForSource(
-  PhabricatorContentSource::SOURCE_LEGACY,
+  PhabricatorOldWorldContentSource::SOURCECONST)->serialize();
-  array())->serialize();
 
 $rows = new LiskRawMigrationIterator($conn_w, $src_table);
 foreach ($rows as $row) {

resources/sql/patches/20131020.pxactionmig.php

@@ -10,8 +10,7 @@ $dst_table = 'project_transaction';
 echo pht('Migrating Project transactions to new format...')."\n";
 
 $content_source = PhabricatorContentSource::newForSource(
-  PhabricatorContentSource::SOURCE_LEGACY,
+  PhabricatorOldWorldContentSource::SOURCECONST)->serialize();
-  array())->serialize();
 
 $rows = new LiskRawMigrationIterator($conn_w, $src_table);
 foreach ($rows as $row) {

scripts/setup/manage_nuance.php

@@ -0,0 +1,21 @@
+#!/usr/bin/env php
+<?php
+
+$root = dirname(dirname(dirname(__FILE__)));
+require_once $root.'/scripts/__init_script__.php';
+
+$args = new PhutilArgumentParser($argv);
+$args->setTagline(pht('manage Nuance'));
+$args->setSynopsis(<<<EOSYNOPSIS
+**nuance** __command__ [__options__]
+  Manage and debug Nuance.
+
+EOSYNOPSIS
+  );
+$args->parseStandardArguments();
+
+$workflows = id(new PhutilClassMapQuery())
+  ->setAncestorClass('NuanceManagementWorkflow')
+  ->execute();
+$workflows[] = new PhutilHelpArgumentWorkflow();
+$args->parseWorkflows($workflows);

src/__phutil_library_map__.php

@@ -473,7 +473,6 @@ phutil_register_library_map(array(
     'DifferentialParseCommitMessageConduitAPIMethod' => 'applications/differential/conduit/DifferentialParseCommitMessageConduitAPIMethod.php',
     'DifferentialParseRenderTestCase' => 'applications/differential/__tests__/DifferentialParseRenderTestCase.php',
     'DifferentialPathField' => 'applications/differential/customfield/DifferentialPathField.php',
-    'DifferentialPrimaryPaneView' => 'applications/differential/view/DifferentialPrimaryPaneView.php',
     'DifferentialProjectReviewersField' => 'applications/differential/customfield/DifferentialProjectReviewersField.php',
     'DifferentialProjectsField' => 'applications/differential/customfield/DifferentialProjectsField.php',
     'DifferentialQueryConduitAPIMethod' => 'applications/differential/conduit/DifferentialQueryConduitAPIMethod.php',
@@ -508,7 +507,6 @@ phutil_register_library_map(array(
     'DifferentialRevisionControlSystem' => 'applications/differential/constants/DifferentialRevisionControlSystem.php',
     'DifferentialRevisionDependedOnByRevisionEdgeType' => 'applications/differential/edge/DifferentialRevisionDependedOnByRevisionEdgeType.php',
     'DifferentialRevisionDependsOnRevisionEdgeType' => 'applications/differential/edge/DifferentialRevisionDependsOnRevisionEdgeType.php',
-    'DifferentialRevisionDetailView' => 'applications/differential/view/DifferentialRevisionDetailView.php',
     'DifferentialRevisionEditController' => 'applications/differential/controller/DifferentialRevisionEditController.php',
     'DifferentialRevisionFulltextEngine' => 'applications/differential/search/DifferentialRevisionFulltextEngine.php',
     'DifferentialRevisionHasCommitEdgeType' => 'applications/differential/edge/DifferentialRevisionHasCommitEdgeType.php',
@@ -635,6 +633,9 @@ phutil_register_library_map(array(
     'DiffusionGitBranch' => 'applications/diffusion/data/DiffusionGitBranch.php',
     'DiffusionGitBranchTestCase' => 'applications/diffusion/data/__tests__/DiffusionGitBranchTestCase.php',
     'DiffusionGitFileContentQuery' => 'applications/diffusion/query/filecontent/DiffusionGitFileContentQuery.php',
+    'DiffusionGitLFSAuthenticateWorkflow' => 'applications/diffusion/gitlfs/DiffusionGitLFSAuthenticateWorkflow.php',
+    'DiffusionGitLFSResponse' => 'applications/diffusion/response/DiffusionGitLFSResponse.php',
+    'DiffusionGitLFSTemporaryTokenType' => 'applications/diffusion/gitlfs/DiffusionGitLFSTemporaryTokenType.php',
     'DiffusionGitRawDiffQuery' => 'applications/diffusion/query/rawdiff/DiffusionGitRawDiffQuery.php',
     'DiffusionGitReceivePackSSHWorkflow' => 'applications/diffusion/ssh/DiffusionGitReceivePackSSHWorkflow.php',
     'DiffusionGitRequest' => 'applications/diffusion/request/DiffusionGitRequest.php',
@@ -840,10 +841,16 @@ phutil_register_library_map(array(
     'DoorkeeperAsanaRemarkupRule' => 'applications/doorkeeper/remarkup/DoorkeeperAsanaRemarkupRule.php',
     'DoorkeeperBridge' => 'applications/doorkeeper/bridge/DoorkeeperBridge.php',
     'DoorkeeperBridgeAsana' => 'applications/doorkeeper/bridge/DoorkeeperBridgeAsana.php',
+    'DoorkeeperBridgeGitHub' => 'applications/doorkeeper/bridge/DoorkeeperBridgeGitHub.php',
+    'DoorkeeperBridgeGitHubIssue' => 'applications/doorkeeper/bridge/DoorkeeperBridgeGitHubIssue.php',
+    'DoorkeeperBridgeGitHubUser' => 'applications/doorkeeper/bridge/DoorkeeperBridgeGitHubUser.php',
     'DoorkeeperBridgeJIRA' => 'applications/doorkeeper/bridge/DoorkeeperBridgeJIRA.php',
     'DoorkeeperBridgeJIRATestCase' => 'applications/doorkeeper/bridge/__tests__/DoorkeeperBridgeJIRATestCase.php',
+    'DoorkeeperBridgedObjectCurtainExtension' => 'applications/doorkeeper/engineextension/DoorkeeperBridgedObjectCurtainExtension.php',
+    'DoorkeeperBridgedObjectInterface' => 'applications/doorkeeper/bridge/DoorkeeperBridgedObjectInterface.php',
     'DoorkeeperDAO' => 'applications/doorkeeper/storage/DoorkeeperDAO.php',
     'DoorkeeperExternalObject' => 'applications/doorkeeper/storage/DoorkeeperExternalObject.php',
+    'DoorkeeperExternalObjectPHIDType' => 'applications/doorkeeper/phid/DoorkeeperExternalObjectPHIDType.php',
     'DoorkeeperExternalObjectQuery' => 'applications/doorkeeper/query/DoorkeeperExternalObjectQuery.php',
     'DoorkeeperFeedStoryPublisher' => 'applications/doorkeeper/engine/DoorkeeperFeedStoryPublisher.php',
     'DoorkeeperFeedWorker' => 'applications/doorkeeper/worker/DoorkeeperFeedWorker.php',
@@ -886,7 +893,7 @@ phutil_register_library_map(array(
     'DrydockBlueprintTransactionQuery' => 'applications/drydock/query/DrydockBlueprintTransactionQuery.php',
     'DrydockBlueprintViewController' => 'applications/drydock/controller/DrydockBlueprintViewController.php',
     'DrydockCommand' => 'applications/drydock/storage/DrydockCommand.php',
-    'DrydockCommandError' => 'applications/drydock/DrydockCommandError/DrydockCommandError.php',
+    'DrydockCommandError' => 'applications/drydock/exception/DrydockCommandError.php',
     'DrydockCommandInterface' => 'applications/drydock/interface/command/DrydockCommandInterface.php',
     'DrydockCommandQuery' => 'applications/drydock/query/DrydockCommandQuery.php',
     'DrydockConsoleController' => 'applications/drydock/controller/DrydockConsoleController.php',
@@ -1017,6 +1024,7 @@ phutil_register_library_map(array(
     'FundInitiative' => 'applications/fund/storage/FundInitiative.php',
     'FundInitiativeBackController' => 'applications/fund/controller/FundInitiativeBackController.php',
     'FundInitiativeCloseController' => 'applications/fund/controller/FundInitiativeCloseController.php',
+    'FundInitiativeCommentController' => 'applications/fund/controller/FundInitiativeCommentController.php',
     'FundInitiativeEditController' => 'applications/fund/controller/FundInitiativeEditController.php',
     'FundInitiativeEditor' => 'applications/fund/editor/FundInitiativeEditor.php',
     'FundInitiativeFulltextEngine' => 'applications/fund/search/FundInitiativeFulltextEngine.php',
@@ -1027,6 +1035,7 @@ phutil_register_library_map(array(
     'FundInitiativeReplyHandler' => 'applications/fund/mail/FundInitiativeReplyHandler.php',
     'FundInitiativeSearchEngine' => 'applications/fund/query/FundInitiativeSearchEngine.php',
     'FundInitiativeTransaction' => 'applications/fund/storage/FundInitiativeTransaction.php',
+    'FundInitiativeTransactionComment' => 'applications/fund/storage/FundInitiativeTransactionComment.php',
     'FundInitiativeTransactionQuery' => 'applications/fund/query/FundInitiativeTransactionQuery.php',
     'FundInitiativeViewController' => 'applications/fund/controller/FundInitiativeViewController.php',
     'FundSchemaSpec' => 'applications/fund/storage/FundSchemaSpec.php',
@@ -1103,6 +1112,9 @@ phutil_register_library_map(array(
     'HarbormasterBuildableTransactionQuery' => 'applications/harbormaster/query/HarbormasterBuildableTransactionQuery.php',
     'HarbormasterBuildableViewController' => 'applications/harbormaster/controller/HarbormasterBuildableViewController.php',
     'HarbormasterBuiltinBuildStepGroup' => 'applications/harbormaster/stepgroup/HarbormasterBuiltinBuildStepGroup.php',
+    'HarbormasterCircleCIBuildStepImplementation' => 'applications/harbormaster/step/HarbormasterCircleCIBuildStepImplementation.php',
+    'HarbormasterCircleCIBuildableInterface' => 'applications/harbormaster/interface/HarbormasterCircleCIBuildableInterface.php',
+    'HarbormasterCircleCIHookController' => 'applications/harbormaster/controller/HarbormasterCircleCIHookController.php',
     'HarbormasterConduitAPIMethod' => 'applications/harbormaster/conduit/HarbormasterConduitAPIMethod.php',
     'HarbormasterController' => 'applications/harbormaster/controller/HarbormasterController.php',
     'HarbormasterCreateArtifactConduitAPIMethod' => 'applications/harbormaster/conduit/HarbormasterCreateArtifactConduitAPIMethod.php',
@@ -1220,6 +1232,7 @@ phutil_register_library_map(array(
     'HeraldRulePHIDType' => 'applications/herald/phid/HeraldRulePHIDType.php',
     'HeraldRuleQuery' => 'applications/herald/query/HeraldRuleQuery.php',
     'HeraldRuleSearchEngine' => 'applications/herald/query/HeraldRuleSearchEngine.php',
+    'HeraldRuleSerializer' => 'applications/herald/editor/HeraldRuleSerializer.php',
     'HeraldRuleTestCase' => 'applications/herald/storage/__tests__/HeraldRuleTestCase.php',
     'HeraldRuleTransaction' => 'applications/herald/storage/HeraldRuleTransaction.php',
     'HeraldRuleTransactionComment' => 'applications/herald/storage/HeraldRuleTransactionComment.php',
@@ -1419,23 +1432,47 @@ phutil_register_library_map(array(
     'MultimeterViewer' => 'applications/multimeter/storage/MultimeterViewer.php',
     'NuanceConduitAPIMethod' => 'applications/nuance/conduit/NuanceConduitAPIMethod.php',
     'NuanceConsoleController' => 'applications/nuance/controller/NuanceConsoleController.php',
+    'NuanceContentSource' => 'applications/nuance/contentsource/NuanceContentSource.php',
     'NuanceController' => 'applications/nuance/controller/NuanceController.php',
-    'NuanceCreateItemConduitAPIMethod' => 'applications/nuance/conduit/NuanceCreateItemConduitAPIMethod.php',
     'NuanceDAO' => 'applications/nuance/storage/NuanceDAO.php',
+    'NuanceGitHubEventItemType' => 'applications/nuance/item/NuanceGitHubEventItemType.php',
+    'NuanceGitHubImportCursor' => 'applications/nuance/cursor/NuanceGitHubImportCursor.php',
+    'NuanceGitHubIssuesImportCursor' => 'applications/nuance/cursor/NuanceGitHubIssuesImportCursor.php',
+    'NuanceGitHubRawEvent' => 'applications/nuance/github/NuanceGitHubRawEvent.php',
+    'NuanceGitHubRawEventTestCase' => 'applications/nuance/github/__tests__/NuanceGitHubRawEventTestCase.php',
+    'NuanceGitHubRepositoryImportCursor' => 'applications/nuance/cursor/NuanceGitHubRepositoryImportCursor.php',
+    'NuanceGitHubRepositorySourceDefinition' => 'applications/nuance/source/NuanceGitHubRepositorySourceDefinition.php',
+    'NuanceImportCursor' => 'applications/nuance/cursor/NuanceImportCursor.php',
+    'NuanceImportCursorData' => 'applications/nuance/storage/NuanceImportCursorData.php',
+    'NuanceImportCursorDataQuery' => 'applications/nuance/query/NuanceImportCursorDataQuery.php',
+    'NuanceImportCursorPHIDType' => 'applications/nuance/phid/NuanceImportCursorPHIDType.php',
     'NuanceItem' => 'applications/nuance/storage/NuanceItem.php',
-    'NuanceItemEditController' => 'applications/nuance/controller/NuanceItemEditController.php',
+    'NuanceItemActionController' => 'applications/nuance/controller/NuanceItemActionController.php',
+    'NuanceItemCommand' => 'applications/nuance/storage/NuanceItemCommand.php',
+    'NuanceItemCommandQuery' => 'applications/nuance/query/NuanceItemCommandQuery.php',
+    'NuanceItemController' => 'applications/nuance/controller/NuanceItemController.php',
     'NuanceItemEditor' => 'applications/nuance/editor/NuanceItemEditor.php',
+    'NuanceItemListController' => 'applications/nuance/controller/NuanceItemListController.php',
+    'NuanceItemManageController' => 'applications/nuance/controller/NuanceItemManageController.php',
     'NuanceItemPHIDType' => 'applications/nuance/phid/NuanceItemPHIDType.php',
     'NuanceItemQuery' => 'applications/nuance/query/NuanceItemQuery.php',
+    'NuanceItemSearchEngine' => 'applications/nuance/query/NuanceItemSearchEngine.php',
     'NuanceItemTransaction' => 'applications/nuance/storage/NuanceItemTransaction.php',
     'NuanceItemTransactionComment' => 'applications/nuance/storage/NuanceItemTransactionComment.php',
     'NuanceItemTransactionQuery' => 'applications/nuance/query/NuanceItemTransactionQuery.php',
+    'NuanceItemType' => 'applications/nuance/item/NuanceItemType.php',
+    'NuanceItemUpdateWorker' => 'applications/nuance/worker/NuanceItemUpdateWorker.php',
     'NuanceItemViewController' => 'applications/nuance/controller/NuanceItemViewController.php',
+    'NuanceManagementImportWorkflow' => 'applications/nuance/management/NuanceManagementImportWorkflow.php',
+    'NuanceManagementUpdateWorkflow' => 'applications/nuance/management/NuanceManagementUpdateWorkflow.php',
+    'NuanceManagementWorkflow' => 'applications/nuance/management/NuanceManagementWorkflow.php',
     'NuancePhabricatorFormSourceDefinition' => 'applications/nuance/source/NuancePhabricatorFormSourceDefinition.php',
     'NuanceQuery' => 'applications/nuance/query/NuanceQuery.php',
     'NuanceQueue' => 'applications/nuance/storage/NuanceQueue.php',
+    'NuanceQueueController' => 'applications/nuance/controller/NuanceQueueController.php',
     'NuanceQueueDatasource' => 'applications/nuance/typeahead/NuanceQueueDatasource.php',
     'NuanceQueueEditController' => 'applications/nuance/controller/NuanceQueueEditController.php',
+    'NuanceQueueEditEngine' => 'applications/nuance/editor/NuanceQueueEditEngine.php',
     'NuanceQueueEditor' => 'applications/nuance/editor/NuanceQueueEditor.php',
     'NuanceQueueListController' => 'applications/nuance/controller/NuanceQueueListController.php',
     'NuanceQueuePHIDType' => 'applications/nuance/phid/NuanceQueuePHIDType.php',
@@ -1445,28 +1482,20 @@ phutil_register_library_map(array(
     'NuanceQueueTransactionComment' => 'applications/nuance/storage/NuanceQueueTransactionComment.php',
     'NuanceQueueTransactionQuery' => 'applications/nuance/query/NuanceQueueTransactionQuery.php',
     'NuanceQueueViewController' => 'applications/nuance/controller/NuanceQueueViewController.php',
-    'NuanceRequestor' => 'applications/nuance/storage/NuanceRequestor.php',
-    'NuanceRequestorEditController' => 'applications/nuance/controller/NuanceRequestorEditController.php',
-    'NuanceRequestorEditor' => 'applications/nuance/editor/NuanceRequestorEditor.php',
-    'NuanceRequestorPHIDType' => 'applications/nuance/phid/NuanceRequestorPHIDType.php',
-    'NuanceRequestorQuery' => 'applications/nuance/query/NuanceRequestorQuery.php',
-    'NuanceRequestorSource' => 'applications/nuance/storage/NuanceRequestorSource.php',
-    'NuanceRequestorTransaction' => 'applications/nuance/storage/NuanceRequestorTransaction.php',
-    'NuanceRequestorTransactionComment' => 'applications/nuance/storage/NuanceRequestorTransactionComment.php',
-    'NuanceRequestorTransactionQuery' => 'applications/nuance/query/NuanceRequestorTransactionQuery.php',
-    'NuanceRequestorViewController' => 'applications/nuance/controller/NuanceRequestorViewController.php',
     'NuanceSchemaSpec' => 'applications/nuance/storage/NuanceSchemaSpec.php',
     'NuanceSource' => 'applications/nuance/storage/NuanceSource.php',
     'NuanceSourceActionController' => 'applications/nuance/controller/NuanceSourceActionController.php',
-    'NuanceSourceCreateController' => 'applications/nuance/controller/NuanceSourceCreateController.php',
+    'NuanceSourceController' => 'applications/nuance/controller/NuanceSourceController.php',
     'NuanceSourceDefaultEditCapability' => 'applications/nuance/capability/NuanceSourceDefaultEditCapability.php',
     'NuanceSourceDefaultViewCapability' => 'applications/nuance/capability/NuanceSourceDefaultViewCapability.php',
     'NuanceSourceDefinition' => 'applications/nuance/source/NuanceSourceDefinition.php',
     'NuanceSourceDefinitionTestCase' => 'applications/nuance/source/__tests__/NuanceSourceDefinitionTestCase.php',
     'NuanceSourceEditController' => 'applications/nuance/controller/NuanceSourceEditController.php',
+    'NuanceSourceEditEngine' => 'applications/nuance/editor/NuanceSourceEditEngine.php',
     'NuanceSourceEditor' => 'applications/nuance/editor/NuanceSourceEditor.php',
     'NuanceSourceListController' => 'applications/nuance/controller/NuanceSourceListController.php',
     'NuanceSourceManageCapability' => 'applications/nuance/capability/NuanceSourceManageCapability.php',
+    'NuanceSourceNameNgrams' => 'applications/nuance/storage/NuanceSourceNameNgrams.php',
     'NuanceSourcePHIDType' => 'applications/nuance/phid/NuanceSourcePHIDType.php',
     'NuanceSourceQuery' => 'applications/nuance/query/NuanceSourceQuery.php',
     'NuanceSourceSearchEngine' => 'applications/nuance/query/NuanceSourceSearchEngine.php',
@@ -1475,6 +1504,7 @@ phutil_register_library_map(array(
     'NuanceSourceTransactionQuery' => 'applications/nuance/query/NuanceSourceTransactionQuery.php',
     'NuanceSourceViewController' => 'applications/nuance/controller/NuanceSourceViewController.php',
     'NuanceTransaction' => 'applications/nuance/storage/NuanceTransaction.php',
+    'NuanceWorker' => 'applications/nuance/worker/NuanceWorker.php',
     'OwnersConduitAPIMethod' => 'applications/owners/conduit/OwnersConduitAPIMethod.php',
     'OwnersEditConduitAPIMethod' => 'applications/owners/conduit/OwnersEditConduitAPIMethod.php',
     'OwnersPackageReplyHandler' => 'applications/owners/mail/OwnersPackageReplyHandler.php',
@@ -1506,6 +1536,9 @@ phutil_register_library_map(array(
     'PHUIColorPalletteExample' => 'applications/uiexample/examples/PHUIColorPalletteExample.php',
     'PHUICrumbView' => 'view/phui/PHUICrumbView.php',
     'PHUICrumbsView' => 'view/phui/PHUICrumbsView.php',
+    'PHUICurtainExtension' => 'view/extension/PHUICurtainExtension.php',
+    'PHUICurtainPanelView' => 'view/layout/PHUICurtainPanelView.php',
+    'PHUICurtainView' => 'view/layout/PHUICurtainView.php',
     'PHUIDiffInlineCommentDetailView' => 'infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php',
     'PHUIDiffInlineCommentEditView' => 'infrastructure/diff/view/PHUIDiffInlineCommentEditView.php',
     'PHUIDiffInlineCommentRowScaffold' => 'infrastructure/diff/view/PHUIDiffInlineCommentRowScaffold.php',
@@ -1617,6 +1650,7 @@ phutil_register_library_map(array(
     'PassphraseSSHPrivateKeyTextCredentialType' => 'applications/passphrase/credentialtype/PassphraseSSHPrivateKeyTextCredentialType.php',
     'PassphraseSchemaSpec' => 'applications/passphrase/storage/PassphraseSchemaSpec.php',
     'PassphraseSecret' => 'applications/passphrase/storage/PassphraseSecret.php',
+    'PassphraseTokenCredentialType' => 'applications/passphrase/credentialtype/PassphraseTokenCredentialType.php',
     'PasteConduitAPIMethod' => 'applications/paste/conduit/PasteConduitAPIMethod.php',
     'PasteCreateConduitAPIMethod' => 'applications/paste/conduit/PasteCreateConduitAPIMethod.php',
     'PasteCreateMailReceiver' => 'applications/paste/mail/PasteCreateMailReceiver.php',
@@ -1776,6 +1810,7 @@ phutil_register_library_map(array(
     'PhabricatorAuthListController' => 'applications/auth/controller/config/PhabricatorAuthListController.php',
     'PhabricatorAuthLoginController' => 'applications/auth/controller/PhabricatorAuthLoginController.php',
     'PhabricatorAuthLoginHandler' => 'applications/auth/handler/PhabricatorAuthLoginHandler.php',
+    'PhabricatorAuthLogoutConduitAPIMethod' => 'applications/auth/conduit/PhabricatorAuthLogoutConduitAPIMethod.php',
     'PhabricatorAuthMainMenuBarExtension' => 'applications/auth/extension/PhabricatorAuthMainMenuBarExtension.php',
     'PhabricatorAuthManagementCachePKCS8Workflow' => 'applications/auth/management/PhabricatorAuthManagementCachePKCS8Workflow.php',
     'PhabricatorAuthManagementLDAPWorkflow' => 'applications/auth/management/PhabricatorAuthManagementLDAPWorkflow.php',
@@ -1793,6 +1828,8 @@ phutil_register_library_map(array(
     'PhabricatorAuthNewController' => 'applications/auth/controller/config/PhabricatorAuthNewController.php',
     'PhabricatorAuthOldOAuthRedirectController' => 'applications/auth/controller/PhabricatorAuthOldOAuthRedirectController.php',
     'PhabricatorAuthOneTimeLoginController' => 'applications/auth/controller/PhabricatorAuthOneTimeLoginController.php',
+    'PhabricatorAuthOneTimeLoginTemporaryTokenType' => 'applications/auth/tokentype/PhabricatorAuthOneTimeLoginTemporaryTokenType.php',
+    'PhabricatorAuthPasswordResetTemporaryTokenType' => 'applications/auth/tokentype/PhabricatorAuthPasswordResetTemporaryTokenType.php',
     'PhabricatorAuthProvider' => 'applications/auth/provider/PhabricatorAuthProvider.php',
     'PhabricatorAuthProviderConfig' => 'applications/auth/storage/PhabricatorAuthProviderConfig.php',
     'PhabricatorAuthProviderConfigController' => 'applications/auth/controller/config/PhabricatorAuthProviderConfigController.php',
@@ -1814,13 +1851,18 @@ phutil_register_library_map(array(
     'PhabricatorAuthSSHPublicKey' => 'applications/auth/sshkey/PhabricatorAuthSSHPublicKey.php',
     'PhabricatorAuthSession' => 'applications/auth/storage/PhabricatorAuthSession.php',
     'PhabricatorAuthSessionEngine' => 'applications/auth/engine/PhabricatorAuthSessionEngine.php',
+    'PhabricatorAuthSessionEngineExtension' => 'applications/auth/engine/PhabricatorAuthSessionEngineExtension.php',
+    'PhabricatorAuthSessionEngineExtensionModule' => 'applications/auth/engine/PhabricatorAuthSessionEngineExtensionModule.php',
     'PhabricatorAuthSessionGarbageCollector' => 'applications/auth/garbagecollector/PhabricatorAuthSessionGarbageCollector.php',
     'PhabricatorAuthSessionQuery' => 'applications/auth/query/PhabricatorAuthSessionQuery.php',
     'PhabricatorAuthSetupCheck' => 'applications/config/check/PhabricatorAuthSetupCheck.php',
     'PhabricatorAuthStartController' => 'applications/auth/controller/PhabricatorAuthStartController.php',
+    'PhabricatorAuthTOTPKeyTemporaryTokenType' => 'applications/auth/factor/PhabricatorAuthTOTPKeyTemporaryTokenType.php',
     'PhabricatorAuthTemporaryToken' => 'applications/auth/storage/PhabricatorAuthTemporaryToken.php',
     'PhabricatorAuthTemporaryTokenGarbageCollector' => 'applications/auth/garbagecollector/PhabricatorAuthTemporaryTokenGarbageCollector.php',
     'PhabricatorAuthTemporaryTokenQuery' => 'applications/auth/query/PhabricatorAuthTemporaryTokenQuery.php',
+    'PhabricatorAuthTemporaryTokenType' => 'applications/auth/tokentype/PhabricatorAuthTemporaryTokenType.php',
+    'PhabricatorAuthTemporaryTokenTypeModule' => 'applications/auth/tokentype/PhabricatorAuthTemporaryTokenTypeModule.php',
     'PhabricatorAuthTerminateSessionController' => 'applications/auth/controller/PhabricatorAuthTerminateSessionController.php',
     'PhabricatorAuthTryFactorAction' => 'applications/auth/action/PhabricatorAuthTryFactorAction.php',
     'PhabricatorAuthUnlinkController' => 'applications/auth/controller/PhabricatorAuthUnlinkController.php',
@@ -1830,12 +1872,16 @@ phutil_register_library_map(array(
     'PhabricatorBadgeHasRecipientEdgeType' => 'applications/badges/edge/PhabricatorBadgeHasRecipientEdgeType.php',
     'PhabricatorBadgesApplication' => 'applications/badges/application/PhabricatorBadgesApplication.php',
     'PhabricatorBadgesArchiveController' => 'applications/badges/controller/PhabricatorBadgesArchiveController.php',
+    'PhabricatorBadgesAward' => 'applications/badges/storage/PhabricatorBadgesAward.php',
+    'PhabricatorBadgesAwardController' => 'applications/badges/controller/PhabricatorBadgesAwardController.php',
+    'PhabricatorBadgesAwardQuery' => 'applications/badges/query/PhabricatorBadgesAwardQuery.php',
     'PhabricatorBadgesBadge' => 'applications/badges/storage/PhabricatorBadgesBadge.php',
     'PhabricatorBadgesCommentController' => 'applications/badges/controller/PhabricatorBadgesCommentController.php',
     'PhabricatorBadgesController' => 'applications/badges/controller/PhabricatorBadgesController.php',
     'PhabricatorBadgesCreateCapability' => 'applications/badges/capability/PhabricatorBadgesCreateCapability.php',
     'PhabricatorBadgesDAO' => 'applications/badges/storage/PhabricatorBadgesDAO.php',
     'PhabricatorBadgesDefaultEditCapability' => 'applications/badges/capability/PhabricatorBadgesDefaultEditCapability.php',
+    'PhabricatorBadgesEditConduitAPIMethod' => 'applications/badges/conduit/PhabricatorBadgesEditConduitAPIMethod.php',
     'PhabricatorBadgesEditController' => 'applications/badges/controller/PhabricatorBadgesEditController.php',
     'PhabricatorBadgesEditEngine' => 'applications/badges/editor/PhabricatorBadgesEditEngine.php',
     'PhabricatorBadgesEditRecipientsController' => 'applications/badges/controller/PhabricatorBadgesEditRecipientsController.php',
@@ -1844,11 +1890,13 @@ phutil_register_library_map(array(
     'PhabricatorBadgesListController' => 'applications/badges/controller/PhabricatorBadgesListController.php',
     'PhabricatorBadgesMailReceiver' => 'applications/badges/mail/PhabricatorBadgesMailReceiver.php',
     'PhabricatorBadgesPHIDType' => 'applications/badges/phid/PhabricatorBadgesPHIDType.php',
+    'PhabricatorBadgesQuality' => 'applications/badges/constants/PhabricatorBadgesQuality.php',
     'PhabricatorBadgesQuery' => 'applications/badges/query/PhabricatorBadgesQuery.php',
     'PhabricatorBadgesRecipientsListView' => 'applications/badges/view/PhabricatorBadgesRecipientsListView.php',
     'PhabricatorBadgesRemoveRecipientsController' => 'applications/badges/controller/PhabricatorBadgesRemoveRecipientsController.php',
     'PhabricatorBadgesReplyHandler' => 'applications/badges/mail/PhabricatorBadgesReplyHandler.php',
     'PhabricatorBadgesSchemaSpec' => 'applications/badges/storage/PhabricatorBadgesSchemaSpec.php',
+    'PhabricatorBadgesSearchConduitAPIMethod' => 'applications/badges/conduit/PhabricatorBadgesSearchConduitAPIMethod.php',
     'PhabricatorBadgesSearchEngine' => 'applications/badges/query/PhabricatorBadgesSearchEngine.php',
     'PhabricatorBadgesTransaction' => 'applications/badges/storage/PhabricatorBadgesTransaction.php',
     'PhabricatorBadgesTransactionComment' => 'applications/badges/storage/PhabricatorBadgesTransactionComment.php',
@@ -1880,6 +1928,7 @@ phutil_register_library_map(array(
     'PhabricatorBritishEnglishTranslation' => 'infrastructure/internationalization/translation/PhabricatorBritishEnglishTranslation.php',
     'PhabricatorBuildbotController' => 'extensions/buildbot/controller/PhabricatorBuildbotController.php',
     'PhabricatorBuiltinPatchList' => 'infrastructure/storage/patch/PhabricatorBuiltinPatchList.php',
+    'PhabricatorBulkContentSource' => 'infrastructure/daemon/contentsource/PhabricatorBulkContentSource.php',
     'PhabricatorBusyUIExample' => 'applications/uiexample/examples/PhabricatorBusyUIExample.php',
     'PhabricatorCacheDAO' => 'applications/cache/storage/PhabricatorCacheDAO.php',
     'PhabricatorCacheGeneralGarbageCollector' => 'applications/cache/garbagecollector/PhabricatorCacheGeneralGarbageCollector.php',
@@ -1954,6 +2003,7 @@ phutil_register_library_map(array(
     'PhabricatorConduitCertificateToken' => 'applications/conduit/storage/PhabricatorConduitCertificateToken.php',
     'PhabricatorConduitConnectionLog' => 'applications/conduit/storage/PhabricatorConduitConnectionLog.php',
     'PhabricatorConduitConsoleController' => 'applications/conduit/controller/PhabricatorConduitConsoleController.php',
+    'PhabricatorConduitContentSource' => 'infrastructure/contentsource/PhabricatorConduitContentSource.php',
     'PhabricatorConduitController' => 'applications/conduit/controller/PhabricatorConduitController.php',
     'PhabricatorConduitDAO' => 'applications/conduit/storage/PhabricatorConduitDAO.php',
     'PhabricatorConduitEditField' => 'applications/transactions/editfield/PhabricatorConduitEditField.php',
@@ -2041,8 +2091,10 @@ phutil_register_library_map(array(
     'PhabricatorConpherencePreferencesSettingsPanel' => 'applications/settings/panel/PhabricatorConpherencePreferencesSettingsPanel.php',
     'PhabricatorConpherenceThreadPHIDType' => 'applications/conpherence/phid/PhabricatorConpherenceThreadPHIDType.php',
     'PhabricatorConsoleApplication' => 'applications/console/application/PhabricatorConsoleApplication.php',
-    'PhabricatorContentSource' => 'applications/metamta/contentsource/PhabricatorContentSource.php',
+    'PhabricatorConsoleContentSource' => 'infrastructure/contentsource/PhabricatorConsoleContentSource.php',
-    'PhabricatorContentSourceView' => 'applications/metamta/contentsource/PhabricatorContentSourceView.php',
+    'PhabricatorContentSource' => 'infrastructure/contentsource/PhabricatorContentSource.php',
+    'PhabricatorContentSourceModule' => 'infrastructure/contentsource/PhabricatorContentSourceModule.php',
+    'PhabricatorContentSourceView' => 'infrastructure/contentsource/PhabricatorContentSourceView.php',
     'PhabricatorContributedToObjectEdgeType' => 'applications/transactions/edges/PhabricatorContributedToObjectEdgeType.php',
     'PhabricatorController' => 'applications/base/controller/PhabricatorController.php',
     'PhabricatorCookies' => 'applications/auth/constants/PhabricatorCookies.php',
@@ -2099,6 +2151,7 @@ phutil_register_library_map(array(
     'PhabricatorDaemonBulkJobMonitorController' => 'applications/daemon/controller/PhabricatorDaemonBulkJobMonitorController.php',
     'PhabricatorDaemonBulkJobViewController' => 'applications/daemon/controller/PhabricatorDaemonBulkJobViewController.php',
     'PhabricatorDaemonConsoleController' => 'applications/daemon/controller/PhabricatorDaemonConsoleController.php',
+    'PhabricatorDaemonContentSource' => 'infrastructure/daemon/contentsource/PhabricatorDaemonContentSource.php',
     'PhabricatorDaemonController' => 'applications/daemon/controller/PhabricatorDaemonController.php',
     'PhabricatorDaemonDAO' => 'applications/daemon/storage/PhabricatorDaemonDAO.php',
     'PhabricatorDaemonEventListener' => 'applications/daemon/event/PhabricatorDaemonEventListener.php',
@@ -2139,7 +2192,6 @@ phutil_register_library_map(array(
     'PhabricatorDashboardDashboardHasPanelEdgeType' => 'applications/dashboard/edge/PhabricatorDashboardDashboardHasPanelEdgeType.php',
     'PhabricatorDashboardDashboardPHIDType' => 'applications/dashboard/phid/PhabricatorDashboardDashboardPHIDType.php',
     'PhabricatorDashboardEditController' => 'applications/dashboard/controller/PhabricatorDashboardEditController.php',
-    'PhabricatorDashboardHistoryController' => 'applications/dashboard/controller/PhabricatorDashboardHistoryController.php',
     'PhabricatorDashboardInstall' => 'applications/dashboard/storage/PhabricatorDashboardInstall.php',
     'PhabricatorDashboardInstallController' => 'applications/dashboard/controller/PhabricatorDashboardInstallController.php',
     'PhabricatorDashboardLayoutConfig' => 'applications/dashboard/layoutconfig/PhabricatorDashboardLayoutConfig.php',
@@ -2263,6 +2315,7 @@ phutil_register_library_map(array(
     'PhabricatorElasticFulltextStorageEngine' => 'applications/search/fulltextstorage/PhabricatorElasticFulltextStorageEngine.php',
     'PhabricatorElasticSearchSetupCheck' => 'applications/config/check/PhabricatorElasticSearchSetupCheck.php',
     'PhabricatorEmailAddressesSettingsPanel' => 'applications/settings/panel/PhabricatorEmailAddressesSettingsPanel.php',
+    'PhabricatorEmailContentSource' => 'applications/metamta/contentsource/PhabricatorEmailContentSource.php',
     'PhabricatorEmailFormatSettingsPanel' => 'applications/settings/panel/PhabricatorEmailFormatSettingsPanel.php',
     'PhabricatorEmailLoginController' => 'applications/auth/controller/PhabricatorEmailLoginController.php',
     'PhabricatorEmailPreferencesSettingsPanel' => 'applications/settings/panel/PhabricatorEmailPreferencesSettingsPanel.php',
@@ -2308,6 +2361,7 @@ phutil_register_library_map(array(
     'PhabricatorFactSimpleSpec' => 'applications/fact/spec/PhabricatorFactSimpleSpec.php',
     'PhabricatorFactSpec' => 'applications/fact/spec/PhabricatorFactSpec.php',
     'PhabricatorFactUpdateIterator' => 'applications/fact/extract/PhabricatorFactUpdateIterator.php',
+    'PhabricatorFaxContentSource' => 'infrastructure/contentsource/PhabricatorFaxContentSource.php',
     'PhabricatorFeedApplication' => 'applications/feed/application/PhabricatorFeedApplication.php',
     'PhabricatorFeedBuilder' => 'applications/feed/builder/PhabricatorFeedBuilder.php',
     'PhabricatorFeedConfigOptions' => 'applications/feed/config/PhabricatorFeedConfigOptions.php',
@@ -2325,6 +2379,7 @@ phutil_register_library_map(array(
     'PhabricatorFeedStoryPublisher' => 'applications/feed/PhabricatorFeedStoryPublisher.php',
     'PhabricatorFeedStoryReference' => 'applications/feed/storage/PhabricatorFeedStoryReference.php',
     'PhabricatorFile' => 'applications/files/storage/PhabricatorFile.php',
+    'PhabricatorFileAccessTemporaryTokenType' => 'applications/files/temporarytoken/PhabricatorFileAccessTemporaryTokenType.php',
     'PhabricatorFileBundleLoader' => 'applications/files/query/PhabricatorFileBundleLoader.php',
     'PhabricatorFileChunk' => 'applications/files/storage/PhabricatorFileChunk.php',
     'PhabricatorFileChunkIterator' => 'applications/files/engine/PhabricatorFileChunkIterator.php',
@@ -2423,6 +2478,7 @@ phutil_register_library_map(array(
     'PhabricatorHandlePool' => 'applications/phid/handle/pool/PhabricatorHandlePool.php',
     'PhabricatorHandlePoolTestCase' => 'applications/phid/handle/pool/__tests__/PhabricatorHandlePoolTestCase.php',
     'PhabricatorHandleQuery' => 'applications/phid/query/PhabricatorHandleQuery.php',
+    'PhabricatorHandleRemarkupRule' => 'applications/phid/remarkup/PhabricatorHandleRemarkupRule.php',
     'PhabricatorHandlesEditField' => 'applications/transactions/editfield/PhabricatorHandlesEditField.php',
     'PhabricatorHarbormasterApplication' => 'applications/harbormaster/application/PhabricatorHarbormasterApplication.php',
     'PhabricatorHarbormasterConfigOptions' => 'applications/harbormaster/config/PhabricatorHarbormasterConfigOptions.php',
@@ -2435,6 +2491,7 @@ phutil_register_library_map(array(
     'PhabricatorHelpKeyboardShortcutController' => 'applications/help/controller/PhabricatorHelpKeyboardShortcutController.php',
     'PhabricatorHelpMainMenuBarExtension' => 'applications/help/extension/PhabricatorHelpMainMenuBarExtension.php',
     'PhabricatorHeraldApplication' => 'applications/herald/application/PhabricatorHeraldApplication.php',
+    'PhabricatorHeraldContentSource' => 'applications/herald/contentsource/PhabricatorHeraldContentSource.php',
     'PhabricatorHighSecurityRequestExceptionHandler' => 'aphront/handler/PhabricatorHighSecurityRequestExceptionHandler.php',
     'PhabricatorHomeApplication' => 'applications/home/application/PhabricatorHomeApplication.php',
     'PhabricatorHomeController' => 'applications/home/controller/PhabricatorHomeController.php',
@@ -2469,6 +2526,7 @@ phutil_register_library_map(array(
     'PhabricatorInvalidConfigSetupCheck' => 'applications/config/check/PhabricatorInvalidConfigSetupCheck.php',
     'PhabricatorIteratedMD5PasswordHasher' => 'infrastructure/util/password/PhabricatorIteratedMD5PasswordHasher.php',
     'PhabricatorIteratedMD5PasswordHasherTestCase' => 'infrastructure/util/password/__tests__/PhabricatorIteratedMD5PasswordHasherTestCase.php',
+    'PhabricatorIteratorFileUploadSource' => 'applications/files/uploadsource/PhabricatorIteratorFileUploadSource.php',
     'PhabricatorJIRAAuthProvider' => 'applications/auth/provider/PhabricatorJIRAAuthProvider.php',
     'PhabricatorJavelinLinter' => 'infrastructure/lint/linter/PhabricatorJavelinLinter.php',
     'PhabricatorJiraIssueHasObjectEdgeType' => 'applications/doorkeeper/edge/PhabricatorJiraIssueHasObjectEdgeType.php',
@@ -2482,6 +2540,7 @@ phutil_register_library_map(array(
     'PhabricatorLibraryTestCase' => '__tests__/PhabricatorLibraryTestCase.php',
     'PhabricatorLinkProfilePanel' => 'applications/search/profilepanel/PhabricatorLinkProfilePanel.php',
     'PhabricatorLipsumArtist' => 'applications/lipsum/image/PhabricatorLipsumArtist.php',
+    'PhabricatorLipsumContentSource' => 'infrastructure/contentsource/PhabricatorLipsumContentSource.php',
     'PhabricatorLipsumGenerateWorkflow' => 'applications/lipsum/management/PhabricatorLipsumGenerateWorkflow.php',
     'PhabricatorLipsumManagementWorkflow' => 'applications/lipsum/management/PhabricatorLipsumManagementWorkflow.php',
     'PhabricatorLipsumMondrianArtist' => 'applications/lipsum/image/PhabricatorLipsumMondrianArtist.php',
@@ -2645,15 +2704,17 @@ phutil_register_library_map(array(
     'PhabricatorNotificationsApplication' => 'applications/notification/application/PhabricatorNotificationsApplication.php',
     'PhabricatorNuanceApplication' => 'applications/nuance/application/PhabricatorNuanceApplication.php',
     'PhabricatorOAuth1AuthProvider' => 'applications/auth/provider/PhabricatorOAuth1AuthProvider.php',
+    'PhabricatorOAuth1SecretTemporaryTokenType' => 'applications/auth/provider/PhabricatorOAuth1SecretTemporaryTokenType.php',
     'PhabricatorOAuth2AuthProvider' => 'applications/auth/provider/PhabricatorOAuth2AuthProvider.php',
     'PhabricatorOAuthAuthProvider' => 'applications/auth/provider/PhabricatorOAuthAuthProvider.php',
     'PhabricatorOAuthClientAuthorization' => 'applications/oauthserver/storage/PhabricatorOAuthClientAuthorization.php',
     'PhabricatorOAuthClientAuthorizationQuery' => 'applications/oauthserver/query/PhabricatorOAuthClientAuthorizationQuery.php',
     'PhabricatorOAuthClientController' => 'applications/oauthserver/controller/client/PhabricatorOAuthClientController.php',
-    'PhabricatorOAuthClientDeleteController' => 'applications/oauthserver/controller/client/PhabricatorOAuthClientDeleteController.php',
+    'PhabricatorOAuthClientDisableController' => 'applications/oauthserver/controller/client/PhabricatorOAuthClientDisableController.php',
     'PhabricatorOAuthClientEditController' => 'applications/oauthserver/controller/client/PhabricatorOAuthClientEditController.php',
     'PhabricatorOAuthClientListController' => 'applications/oauthserver/controller/client/PhabricatorOAuthClientListController.php',
     'PhabricatorOAuthClientSecretController' => 'applications/oauthserver/controller/client/PhabricatorOAuthClientSecretController.php',
+    'PhabricatorOAuthClientTestController' => 'applications/oauthserver/controller/client/PhabricatorOAuthClientTestController.php',
     'PhabricatorOAuthClientViewController' => 'applications/oauthserver/controller/client/PhabricatorOAuthClientViewController.php',
     'PhabricatorOAuthResponse' => 'applications/oauthserver/PhabricatorOAuthResponse.php',
     'PhabricatorOAuthServer' => 'applications/oauthserver/PhabricatorOAuthServer.php',
@@ -2670,10 +2731,13 @@ phutil_register_library_map(array(
     'PhabricatorOAuthServerController' => 'applications/oauthserver/controller/PhabricatorOAuthServerController.php',
     'PhabricatorOAuthServerCreateClientsCapability' => 'applications/oauthserver/capability/PhabricatorOAuthServerCreateClientsCapability.php',
     'PhabricatorOAuthServerDAO' => 'applications/oauthserver/storage/PhabricatorOAuthServerDAO.php',
+    'PhabricatorOAuthServerEditEngine' => 'applications/oauthserver/editor/PhabricatorOAuthServerEditEngine.php',
+    'PhabricatorOAuthServerEditor' => 'applications/oauthserver/editor/PhabricatorOAuthServerEditor.php',
     'PhabricatorOAuthServerScope' => 'applications/oauthserver/PhabricatorOAuthServerScope.php',
     'PhabricatorOAuthServerTestCase' => 'applications/oauthserver/__tests__/PhabricatorOAuthServerTestCase.php',
-    'PhabricatorOAuthServerTestController' => 'applications/oauthserver/controller/PhabricatorOAuthServerTestController.php',
     'PhabricatorOAuthServerTokenController' => 'applications/oauthserver/controller/PhabricatorOAuthServerTokenController.php',
+    'PhabricatorOAuthServerTransaction' => 'applications/oauthserver/storage/PhabricatorOAuthServerTransaction.php',
+    'PhabricatorOAuthServerTransactionQuery' => 'applications/oauthserver/query/PhabricatorOAuthServerTransactionQuery.php',
     'PhabricatorObjectHandle' => 'applications/phid/PhabricatorObjectHandle.php',
     'PhabricatorObjectHasAsanaSubtaskEdgeType' => 'applications/doorkeeper/edge/PhabricatorObjectHasAsanaSubtaskEdgeType.php',
     'PhabricatorObjectHasAsanaTaskEdgeType' => 'applications/doorkeeper/edge/PhabricatorObjectHasAsanaTaskEdgeType.php',
@@ -2694,6 +2758,7 @@ phutil_register_library_map(array(
     'PhabricatorObjectSelectorDialog' => 'view/control/PhabricatorObjectSelectorDialog.php',
     'PhabricatorObjectUsesCredentialsEdgeType' => 'applications/transactions/edges/PhabricatorObjectUsesCredentialsEdgeType.php',
     'PhabricatorOffsetPagedQuery' => 'infrastructure/query/PhabricatorOffsetPagedQuery.php',
+    'PhabricatorOldWorldContentSource' => 'infrastructure/contentsource/PhabricatorOldWorldContentSource.php',
     'PhabricatorOneTimeTriggerClock' => 'infrastructure/daemon/workers/clock/PhabricatorOneTimeTriggerClock.php',
     'PhabricatorOpcodeCacheSpec' => 'applications/cache/spec/PhabricatorOpcodeCacheSpec.php',
     'PhabricatorOwnerPathQuery' => 'applications/owners/query/PhabricatorOwnerPathQuery.php',
@@ -2828,6 +2893,7 @@ phutil_register_library_map(array(
     'PhabricatorPholioConfigOptions' => 'applications/pholio/config/PhabricatorPholioConfigOptions.php',
     'PhabricatorPholioMockTestDataGenerator' => 'applications/pholio/lipsum/PhabricatorPholioMockTestDataGenerator.php',
     'PhabricatorPhortuneApplication' => 'applications/phortune/application/PhabricatorPhortuneApplication.php',
+    'PhabricatorPhortuneContentSource' => 'applications/phortune/contentsource/PhabricatorPhortuneContentSource.php',
     'PhabricatorPhortuneManagementInvoiceWorkflow' => 'applications/phortune/management/PhabricatorPhortuneManagementInvoiceWorkflow.php',
     'PhabricatorPhortuneManagementWorkflow' => 'applications/phortune/management/PhabricatorPhortuneManagementWorkflow.php',
     'PhabricatorPhragmentApplication' => 'applications/phragment/application/PhabricatorPhragmentApplication.php',
@@ -3015,6 +3081,7 @@ phutil_register_library_map(array(
     'PhabricatorProjectWatcherListView' => 'applications/project/view/PhabricatorProjectWatcherListView.php',
     'PhabricatorProjectWorkboardBackgroundColor' => 'applications/project/constants/PhabricatorProjectWorkboardBackgroundColor.php',
     'PhabricatorProjectWorkboardProfilePanel' => 'applications/project/profilepanel/PhabricatorProjectWorkboardProfilePanel.php',
+    'PhabricatorProjectsCurtainExtension' => 'applications/project/engineextension/PhabricatorProjectsCurtainExtension.php',
     'PhabricatorProjectsEditEngineExtension' => 'applications/project/engineextension/PhabricatorProjectsEditEngineExtension.php',
     'PhabricatorProjectsEditField' => 'applications/transactions/editfield/PhabricatorProjectsEditField.php',
     'PhabricatorProjectsFulltextEngineExtension' => 'applications/project/engineextension/PhabricatorProjectsFulltextEngineExtension.php',
@@ -3066,6 +3133,8 @@ phutil_register_library_map(array(
     'PhabricatorRepositoryEngine' => 'applications/repository/engine/PhabricatorRepositoryEngine.php',
     'PhabricatorRepositoryGitCommitChangeParserWorker' => 'applications/repository/worker/commitchangeparser/PhabricatorRepositoryGitCommitChangeParserWorker.php',
     'PhabricatorRepositoryGitCommitMessageParserWorker' => 'applications/repository/worker/commitmessageparser/PhabricatorRepositoryGitCommitMessageParserWorker.php',
+    'PhabricatorRepositoryGitLFSRef' => 'applications/repository/storage/PhabricatorRepositoryGitLFSRef.php',
+    'PhabricatorRepositoryGitLFSRefQuery' => 'applications/repository/query/PhabricatorRepositoryGitLFSRefQuery.php',
     'PhabricatorRepositoryGraphCache' => 'applications/repository/graphcache/PhabricatorRepositoryGraphCache.php',
     'PhabricatorRepositoryGraphStream' => 'applications/repository/daemon/PhabricatorRepositoryGraphStream.php',
     'PhabricatorRepositoryManagementCacheWorkflow' => 'applications/repository/management/PhabricatorRepositoryManagementCacheWorkflow.php',
@@ -3325,6 +3394,7 @@ phutil_register_library_map(array(
     'PhabricatorSubscriptionsAddSelfHeraldAction' => 'applications/subscriptions/herald/PhabricatorSubscriptionsAddSelfHeraldAction.php',
     'PhabricatorSubscriptionsAddSubscribersHeraldAction' => 'applications/subscriptions/herald/PhabricatorSubscriptionsAddSubscribersHeraldAction.php',
     'PhabricatorSubscriptionsApplication' => 'applications/subscriptions/application/PhabricatorSubscriptionsApplication.php',
+    'PhabricatorSubscriptionsCurtainExtension' => 'applications/subscriptions/engineextension/PhabricatorSubscriptionsCurtainExtension.php',
     'PhabricatorSubscriptionsEditController' => 'applications/subscriptions/controller/PhabricatorSubscriptionsEditController.php',
     'PhabricatorSubscriptionsEditEngineExtension' => 'applications/subscriptions/engineextension/PhabricatorSubscriptionsEditEngineExtension.php',
     'PhabricatorSubscriptionsEditor' => 'applications/subscriptions/editor/PhabricatorSubscriptionsEditor.php',
@@ -3393,6 +3463,7 @@ phutil_register_library_map(array(
     'PhabricatorTokenUIEventListener' => 'applications/tokens/event/PhabricatorTokenUIEventListener.php',
     'PhabricatorTokenizerEditField' => 'applications/transactions/editfield/PhabricatorTokenizerEditField.php',
     'PhabricatorTokensApplication' => 'applications/tokens/application/PhabricatorTokensApplication.php',
+    'PhabricatorTokensCurtainExtension' => 'applications/tokens/engineextension/PhabricatorTokensCurtainExtension.php',
     'PhabricatorTokensSettingsPanel' => 'applications/settings/panel/PhabricatorTokensSettingsPanel.php',
     'PhabricatorTooltipUIExample' => 'applications/uiexample/examples/PhabricatorTooltipUIExample.php',
     'PhabricatorTransactions' => 'applications/transactions/constants/PhabricatorTransactions.php',
@@ -3424,7 +3495,9 @@ phutil_register_library_map(array(
     'PhabricatorUIExampleRenderController' => 'applications/uiexample/controller/PhabricatorUIExampleRenderController.php',
     'PhabricatorUIExamplesApplication' => 'applications/uiexample/application/PhabricatorUIExamplesApplication.php',
     'PhabricatorUSEnglishTranslation' => 'infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php',
+    'PhabricatorUnitTestContentSource' => 'infrastructure/contentsource/PhabricatorUnitTestContentSource.php',
     'PhabricatorUnitsTestCase' => 'view/__tests__/PhabricatorUnitsTestCase.php',
+    'PhabricatorUnknownContentSource' => 'infrastructure/contentsource/PhabricatorUnknownContentSource.php',
     'PhabricatorUnsubscribedFromObjectEdgeType' => 'applications/transactions/edges/PhabricatorUnsubscribedFromObjectEdgeType.php',
     'PhabricatorUser' => 'applications/people/storage/PhabricatorUser.php',
     'PhabricatorUserBlurbField' => 'applications/people/customfield/PhabricatorUserBlurbField.php',
@@ -3464,6 +3537,7 @@ phutil_register_library_map(array(
     'PhabricatorVeryWowEnglishTranslation' => 'infrastructure/internationalization/translation/PhabricatorVeryWowEnglishTranslation.php',
     'PhabricatorViewerDatasource' => 'applications/people/typeahead/PhabricatorViewerDatasource.php',
     'PhabricatorWatcherHasObjectEdgeType' => 'applications/transactions/edges/PhabricatorWatcherHasObjectEdgeType.php',
+    'PhabricatorWebContentSource' => 'infrastructure/contentsource/PhabricatorWebContentSource.php',
     'PhabricatorWordPressAuthProvider' => 'applications/auth/provider/PhabricatorWordPressAuthProvider.php',
     'PhabricatorWorker' => 'infrastructure/daemon/workers/PhabricatorWorker.php',
     'PhabricatorWorkerActiveTask' => 'infrastructure/daemon/workers/storage/PhabricatorWorkerActiveTask.php',
@@ -3768,6 +3842,7 @@ phutil_register_library_map(array(
     'PhragmentZIPController' => 'applications/phragment/controller/PhragmentZIPController.php',
     'PhrequentConduitAPIMethod' => 'applications/phrequent/conduit/PhrequentConduitAPIMethod.php',
     'PhrequentController' => 'applications/phrequent/controller/PhrequentController.php',
+    'PhrequentCurtainExtension' => 'applications/phrequent/engineextension/PhrequentCurtainExtension.php',
     'PhrequentDAO' => 'applications/phrequent/storage/PhrequentDAO.php',
     'PhrequentListController' => 'applications/phrequent/controller/PhrequentListController.php',
     'PhrequentPopConduitAPIMethod' => 'applications/phrequent/conduit/PhrequentPopConduitAPIMethod.php',
@@ -4477,6 +4552,7 @@ phutil_register_library_map(array(
       'DifferentialDAO',
       'PhabricatorPolicyInterface',
       'HarbormasterBuildableInterface',
+      'HarbormasterCircleCIBuildableInterface',
       'PhabricatorApplicationTransactionInterface',
       'PhabricatorDestructibleInterface',
     ),
@@ -4553,7 +4629,6 @@ phutil_register_library_map(array(
     'DifferentialParseCommitMessageConduitAPIMethod' => 'DifferentialConduitAPIMethod',
     'DifferentialParseRenderTestCase' => 'PhabricatorTestCase',
     'DifferentialPathField' => 'DifferentialCustomField',
-    'DifferentialPrimaryPaneView' => 'AphrontView',
     'DifferentialProjectReviewersField' => 'DifferentialCustomField',
     'DifferentialProjectsField' => 'DifferentialCoreCustomField',
     'DifferentialQueryConduitAPIMethod' => 'DifferentialConduitAPIMethod',
@@ -4603,7 +4678,6 @@ phutil_register_library_map(array(
     'DifferentialRevisionControlSystem' => 'Phobject',
     'DifferentialRevisionDependedOnByRevisionEdgeType' => 'PhabricatorEdgeType',
     'DifferentialRevisionDependsOnRevisionEdgeType' => 'PhabricatorEdgeType',
-    'DifferentialRevisionDetailView' => 'AphrontView',
     'DifferentialRevisionEditController' => 'DifferentialController',
     'DifferentialRevisionFulltextEngine' => 'PhabricatorFulltextEngine',
     'DifferentialRevisionHasCommitEdgeType' => 'PhabricatorEdgeType',
@@ -4730,6 +4804,9 @@ phutil_register_library_map(array(
     'DiffusionGitBranch' => 'Phobject',
     'DiffusionGitBranchTestCase' => 'PhabricatorTestCase',
     'DiffusionGitFileContentQuery' => 'DiffusionFileContentQuery',
+    'DiffusionGitLFSAuthenticateWorkflow' => 'DiffusionGitSSHWorkflow',
+    'DiffusionGitLFSResponse' => 'AphrontResponse',
+    'DiffusionGitLFSTemporaryTokenType' => 'PhabricatorAuthTemporaryTokenType',
     'DiffusionGitRawDiffQuery' => 'DiffusionRawDiffQuery',
     'DiffusionGitReceivePackSSHWorkflow' => 'DiffusionGitSSHWorkflow',
     'DiffusionGitRequest' => 'DiffusionRequest',
@@ -4948,13 +5025,18 @@ phutil_register_library_map(array(
     'DoorkeeperAsanaRemarkupRule' => 'DoorkeeperRemarkupRule',
     'DoorkeeperBridge' => 'Phobject',
     'DoorkeeperBridgeAsana' => 'DoorkeeperBridge',
+    'DoorkeeperBridgeGitHub' => 'DoorkeeperBridge',
+    'DoorkeeperBridgeGitHubIssue' => 'DoorkeeperBridgeGitHub',
+    'DoorkeeperBridgeGitHubUser' => 'DoorkeeperBridgeGitHub',
     'DoorkeeperBridgeJIRA' => 'DoorkeeperBridge',
     'DoorkeeperBridgeJIRATestCase' => 'PhabricatorTestCase',
+    'DoorkeeperBridgedObjectCurtainExtension' => 'PHUICurtainExtension',
     'DoorkeeperDAO' => 'PhabricatorLiskDAO',
     'DoorkeeperExternalObject' => array(
       'DoorkeeperDAO',
       'PhabricatorPolicyInterface',
     ),
+    'DoorkeeperExternalObjectPHIDType' => 'PhabricatorPHIDType',
     'DoorkeeperExternalObjectQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'DoorkeeperFeedStoryPublisher' => 'Phobject',
     'DoorkeeperFeedWorker' => 'FeedPushWorker',
@@ -5013,6 +5095,7 @@ phutil_register_library_map(array(
       'DrydockDAO',
       'PhabricatorPolicyInterface',
     ),
+    'DrydockCommandError' => 'Phobject',
     'DrydockCommandInterface' => 'DrydockInterface',
     'DrydockCommandQuery' => 'DrydockQuery',
     'DrydockConsoleController' => 'DrydockController',
@@ -5170,6 +5253,7 @@ phutil_register_library_map(array(
     ),
     'FundInitiativeBackController' => 'FundController',
     'FundInitiativeCloseController' => 'FundController',
+    'FundInitiativeCommentController' => 'FundController',
     'FundInitiativeEditController' => 'FundController',
     'FundInitiativeEditor' => 'PhabricatorApplicationTransactionEditor',
     'FundInitiativeFulltextEngine' => 'PhabricatorFulltextEngine',
@@ -5180,6 +5264,7 @@ phutil_register_library_map(array(
     'FundInitiativeReplyHandler' => 'PhabricatorApplicationTransactionReplyHandler',
     'FundInitiativeSearchEngine' => 'PhabricatorApplicationSearchEngine',
     'FundInitiativeTransaction' => 'PhabricatorApplicationTransaction',
+    'FundInitiativeTransactionComment' => 'PhabricatorApplicationTransactionComment',
     'FundInitiativeTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
     'FundInitiativeViewController' => 'FundController',
     'FundSchemaSpec' => 'PhabricatorConfigSchemaSpec',
@@ -5290,6 +5375,8 @@ phutil_register_library_map(array(
     'HarbormasterBuildableTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
     'HarbormasterBuildableViewController' => 'HarbormasterController',
     'HarbormasterBuiltinBuildStepGroup' => 'HarbormasterBuildStepGroup',
+    'HarbormasterCircleCIBuildStepImplementation' => 'HarbormasterBuildStepImplementation',
+    'HarbormasterCircleCIHookController' => 'HarbormasterController',
     'HarbormasterConduitAPIMethod' => 'ConduitAPIMethod',
     'HarbormasterController' => 'PhabricatorController',
     'HarbormasterCreateArtifactConduitAPIMethod' => 'HarbormasterConduitAPIMethod',
@@ -5420,6 +5507,7 @@ phutil_register_library_map(array(
     'HeraldRulePHIDType' => 'PhabricatorPHIDType',
     'HeraldRuleQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'HeraldRuleSearchEngine' => 'PhabricatorApplicationSearchEngine',
+    'HeraldRuleSerializer' => 'Phobject',
     'HeraldRuleTestCase' => 'PhabricatorTestCase',
     'HeraldRuleTransaction' => 'PhabricatorApplicationTransaction',
     'HeraldRuleTransactionComment' => 'PhabricatorApplicationTransactionComment',
@@ -5587,6 +5675,7 @@ phutil_register_library_map(array(
       'PhabricatorSpacesInterface',
       'PhabricatorConduitResultInterface',
       'PhabricatorFulltextInterface',
+      'DoorkeeperBridgedObjectInterface',
     ),
     'ManiphestTaskAssignHeraldAction' => 'HeraldAction',
     'ManiphestTaskAssignOtherHeraldAction' => 'ManiphestTaskAssignHeraldAction',
@@ -5654,22 +5743,50 @@ phutil_register_library_map(array(
     'MultimeterViewer' => 'MultimeterDimension',
     'NuanceConduitAPIMethod' => 'ConduitAPIMethod',
     'NuanceConsoleController' => 'NuanceController',
+    'NuanceContentSource' => 'PhabricatorContentSource',
     'NuanceController' => 'PhabricatorController',
-    'NuanceCreateItemConduitAPIMethod' => 'NuanceConduitAPIMethod',
     'NuanceDAO' => 'PhabricatorLiskDAO',
+    'NuanceGitHubEventItemType' => 'NuanceItemType',
+    'NuanceGitHubImportCursor' => 'NuanceImportCursor',
+    'NuanceGitHubIssuesImportCursor' => 'NuanceGitHubImportCursor',
+    'NuanceGitHubRawEvent' => 'Phobject',
+    'NuanceGitHubRawEventTestCase' => 'PhabricatorTestCase',
+    'NuanceGitHubRepositoryImportCursor' => 'NuanceGitHubImportCursor',
+    'NuanceGitHubRepositorySourceDefinition' => 'NuanceSourceDefinition',
+    'NuanceImportCursor' => 'Phobject',
+    'NuanceImportCursorData' => array(
+      'NuanceDAO',
+      'PhabricatorPolicyInterface',
+    ),
+    'NuanceImportCursorDataQuery' => 'NuanceQuery',
+    'NuanceImportCursorPHIDType' => 'PhabricatorPHIDType',
     'NuanceItem' => array(
       'NuanceDAO',
       'PhabricatorPolicyInterface',
       'PhabricatorApplicationTransactionInterface',
     ),
-    'NuanceItemEditController' => 'NuanceController',
+    'NuanceItemActionController' => 'NuanceController',
+    'NuanceItemCommand' => array(
+      'NuanceDAO',
+      'PhabricatorPolicyInterface',
+    ),
+    'NuanceItemCommandQuery' => 'NuanceQuery',
+    'NuanceItemController' => 'NuanceController',
     'NuanceItemEditor' => 'PhabricatorApplicationTransactionEditor',
+    'NuanceItemListController' => 'NuanceItemController',
+    'NuanceItemManageController' => 'NuanceController',
     'NuanceItemPHIDType' => 'PhabricatorPHIDType',
     'NuanceItemQuery' => 'NuanceQuery',
+    'NuanceItemSearchEngine' => 'PhabricatorApplicationSearchEngine',
     'NuanceItemTransaction' => 'NuanceTransaction',
     'NuanceItemTransactionComment' => 'PhabricatorApplicationTransactionComment',
     'NuanceItemTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
+    'NuanceItemType' => 'Phobject',
+    'NuanceItemUpdateWorker' => 'NuanceWorker',
     'NuanceItemViewController' => 'NuanceController',
+    'NuanceManagementImportWorkflow' => 'NuanceManagementWorkflow',
+    'NuanceManagementUpdateWorkflow' => 'NuanceManagementWorkflow',
+    'NuanceManagementWorkflow' => 'PhabricatorManagementWorkflow',
     'NuancePhabricatorFormSourceDefinition' => 'NuanceSourceDefinition',
     'NuanceQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'NuanceQueue' => array(
@@ -5677,55 +5794,47 @@ phutil_register_library_map(array(
       'PhabricatorPolicyInterface',
       'PhabricatorApplicationTransactionInterface',
     ),
+    'NuanceQueueController' => 'NuanceController',
     'NuanceQueueDatasource' => 'PhabricatorTypeaheadDatasource',
-    'NuanceQueueEditController' => 'NuanceController',
+    'NuanceQueueEditController' => 'NuanceQueueController',
+    'NuanceQueueEditEngine' => 'PhabricatorEditEngine',
     'NuanceQueueEditor' => 'PhabricatorApplicationTransactionEditor',
-    'NuanceQueueListController' => 'NuanceController',
+    'NuanceQueueListController' => 'NuanceQueueController',
     'NuanceQueuePHIDType' => 'PhabricatorPHIDType',
     'NuanceQueueQuery' => 'NuanceQuery',
     'NuanceQueueSearchEngine' => 'PhabricatorApplicationSearchEngine',
     'NuanceQueueTransaction' => 'NuanceTransaction',
     'NuanceQueueTransactionComment' => 'PhabricatorApplicationTransactionComment',
     'NuanceQueueTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
-    'NuanceQueueViewController' => 'NuanceController',
+    'NuanceQueueViewController' => 'NuanceQueueController',
-    'NuanceRequestor' => array(
-      'NuanceDAO',
-      'PhabricatorPolicyInterface',
-      'PhabricatorApplicationTransactionInterface',
-    ),
-    'NuanceRequestorEditController' => 'NuanceController',
-    'NuanceRequestorEditor' => 'PhabricatorApplicationTransactionEditor',
-    'NuanceRequestorPHIDType' => 'PhabricatorPHIDType',
-    'NuanceRequestorQuery' => 'NuanceQuery',
-    'NuanceRequestorSource' => 'NuanceDAO',
-    'NuanceRequestorTransaction' => 'NuanceTransaction',
-    'NuanceRequestorTransactionComment' => 'PhabricatorApplicationTransactionComment',
-    'NuanceRequestorTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
-    'NuanceRequestorViewController' => 'NuanceController',
     'NuanceSchemaSpec' => 'PhabricatorConfigSchemaSpec',
     'NuanceSource' => array(
       'NuanceDAO',
       'PhabricatorApplicationTransactionInterface',
       'PhabricatorPolicyInterface',
+      'PhabricatorNgramsInterface',
     ),
     'NuanceSourceActionController' => 'NuanceController',
-    'NuanceSourceCreateController' => 'NuanceController',
+    'NuanceSourceController' => 'NuanceController',
     'NuanceSourceDefaultEditCapability' => 'PhabricatorPolicyCapability',
     'NuanceSourceDefaultViewCapability' => 'PhabricatorPolicyCapability',
     'NuanceSourceDefinition' => 'Phobject',
     'NuanceSourceDefinitionTestCase' => 'PhabricatorTestCase',
-    'NuanceSourceEditController' => 'NuanceController',
+    'NuanceSourceEditController' => 'NuanceSourceController',
+    'NuanceSourceEditEngine' => 'PhabricatorEditEngine',
     'NuanceSourceEditor' => 'PhabricatorApplicationTransactionEditor',
-    'NuanceSourceListController' => 'NuanceController',
+    'NuanceSourceListController' => 'NuanceSourceController',
     'NuanceSourceManageCapability' => 'PhabricatorPolicyCapability',
+    'NuanceSourceNameNgrams' => 'PhabricatorSearchNgrams',
     'NuanceSourcePHIDType' => 'PhabricatorPHIDType',
     'NuanceSourceQuery' => 'NuanceQuery',
     'NuanceSourceSearchEngine' => 'PhabricatorApplicationSearchEngine',
     'NuanceSourceTransaction' => 'NuanceTransaction',
     'NuanceSourceTransactionComment' => 'PhabricatorApplicationTransactionComment',
     'NuanceSourceTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
-    'NuanceSourceViewController' => 'NuanceController',
+    'NuanceSourceViewController' => 'NuanceSourceController',
     'NuanceTransaction' => 'PhabricatorApplicationTransaction',
+    'NuanceWorker' => 'PhabricatorWorker',
     'OwnersConduitAPIMethod' => 'ConduitAPIMethod',
     'OwnersEditConduitAPIMethod' => 'PhabricatorEditEngineAPIMethod',
     'OwnersPackageReplyHandler' => 'PhabricatorMailReplyHandler',
@@ -5757,6 +5866,9 @@ phutil_register_library_map(array(
     'PHUIColorPalletteExample' => 'PhabricatorUIExample',
     'PHUICrumbView' => 'AphrontView',
     'PHUICrumbsView' => 'AphrontView',
+    'PHUICurtainExtension' => 'Phobject',
+    'PHUICurtainPanelView' => 'AphrontTagView',
+    'PHUICurtainView' => 'AphrontTagView',
     'PHUIDiffInlineCommentDetailView' => 'PHUIDiffInlineCommentView',
     'PHUIDiffInlineCommentEditView' => 'PHUIDiffInlineCommentView',
     'PHUIDiffInlineCommentRowScaffold' => 'AphrontView',
@@ -5877,6 +5989,7 @@ phutil_register_library_map(array(
     'PassphraseSSHPrivateKeyTextCredentialType' => 'PassphraseSSHPrivateKeyCredentialType',
     'PassphraseSchemaSpec' => 'PhabricatorConfigSchemaSpec',
     'PassphraseSecret' => 'PassphraseDAO',
+    'PassphraseTokenCredentialType' => 'PassphraseCredentialType',
     'PasteConduitAPIMethod' => 'ConduitAPIMethod',
     'PasteCreateConduitAPIMethod' => 'PasteConduitAPIMethod',
     'PasteCreateMailReceiver' => 'PhabricatorMailReceiver',
@@ -6053,6 +6166,7 @@ phutil_register_library_map(array(
     'PhabricatorAuthListController' => 'PhabricatorAuthProviderConfigController',
     'PhabricatorAuthLoginController' => 'PhabricatorAuthController',
     'PhabricatorAuthLoginHandler' => 'Phobject',
+    'PhabricatorAuthLogoutConduitAPIMethod' => 'PhabricatorAuthConduitAPIMethod',
     'PhabricatorAuthMainMenuBarExtension' => 'PhabricatorMainMenuBarExtension',
     'PhabricatorAuthManagementCachePKCS8Workflow' => 'PhabricatorAuthManagementWorkflow',
     'PhabricatorAuthManagementLDAPWorkflow' => 'PhabricatorAuthManagementWorkflow',
@@ -6070,6 +6184,8 @@ phutil_register_library_map(array(
     'PhabricatorAuthNewController' => 'PhabricatorAuthProviderConfigController',
     'PhabricatorAuthOldOAuthRedirectController' => 'PhabricatorAuthController',
     'PhabricatorAuthOneTimeLoginController' => 'PhabricatorAuthController',
+    'PhabricatorAuthOneTimeLoginTemporaryTokenType' => 'PhabricatorAuthTemporaryTokenType',
+    'PhabricatorAuthPasswordResetTemporaryTokenType' => 'PhabricatorAuthTemporaryTokenType',
     'PhabricatorAuthProvider' => 'Phobject',
     'PhabricatorAuthProviderConfig' => array(
       'PhabricatorAuthDAO',
@@ -6102,16 +6218,21 @@ phutil_register_library_map(array(
       'PhabricatorPolicyInterface',
     ),
     'PhabricatorAuthSessionEngine' => 'Phobject',
+    'PhabricatorAuthSessionEngineExtension' => 'Phobject',
+    'PhabricatorAuthSessionEngineExtensionModule' => 'PhabricatorConfigModule',
     'PhabricatorAuthSessionGarbageCollector' => 'PhabricatorGarbageCollector',
     'PhabricatorAuthSessionQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'PhabricatorAuthSetupCheck' => 'PhabricatorSetupCheck',
     'PhabricatorAuthStartController' => 'PhabricatorAuthController',
+    'PhabricatorAuthTOTPKeyTemporaryTokenType' => 'PhabricatorAuthTemporaryTokenType',
     'PhabricatorAuthTemporaryToken' => array(
       'PhabricatorAuthDAO',
       'PhabricatorPolicyInterface',
     ),
     'PhabricatorAuthTemporaryTokenGarbageCollector' => 'PhabricatorGarbageCollector',
     'PhabricatorAuthTemporaryTokenQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
+    'PhabricatorAuthTemporaryTokenType' => 'Phobject',
+    'PhabricatorAuthTemporaryTokenTypeModule' => 'PhabricatorConfigModule',
     'PhabricatorAuthTerminateSessionController' => 'PhabricatorAuthController',
     'PhabricatorAuthTryFactorAction' => 'PhabricatorSystemAction',
     'PhabricatorAuthUnlinkController' => 'PhabricatorAuthController',
@@ -6121,6 +6242,13 @@ phutil_register_library_map(array(
     'PhabricatorBadgeHasRecipientEdgeType' => 'PhabricatorEdgeType',
     'PhabricatorBadgesApplication' => 'PhabricatorApplication',
     'PhabricatorBadgesArchiveController' => 'PhabricatorBadgesController',
+    'PhabricatorBadgesAward' => array(
+      'PhabricatorBadgesDAO',
+      'PhabricatorDestructibleInterface',
+      'PhabricatorPolicyInterface',
+    ),
+    'PhabricatorBadgesAwardController' => 'PhabricatorBadgesController',
+    'PhabricatorBadgesAwardQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'PhabricatorBadgesBadge' => array(
       'PhabricatorBadgesDAO',
       'PhabricatorPolicyInterface',
@@ -6129,12 +6257,14 @@ phutil_register_library_map(array(
       'PhabricatorTokenReceiverInterface',
       'PhabricatorFlaggableInterface',
       'PhabricatorDestructibleInterface',
+      'PhabricatorConduitResultInterface',
     ),
     'PhabricatorBadgesCommentController' => 'PhabricatorBadgesController',
     'PhabricatorBadgesController' => 'PhabricatorController',
     'PhabricatorBadgesCreateCapability' => 'PhabricatorPolicyCapability',
     'PhabricatorBadgesDAO' => 'PhabricatorLiskDAO',
     'PhabricatorBadgesDefaultEditCapability' => 'PhabricatorPolicyCapability',
+    'PhabricatorBadgesEditConduitAPIMethod' => 'PhabricatorEditEngineAPIMethod',
     'PhabricatorBadgesEditController' => 'PhabricatorBadgesController',
     'PhabricatorBadgesEditEngine' => 'PhabricatorEditEngine',
     'PhabricatorBadgesEditRecipientsController' => 'PhabricatorBadgesController',
@@ -6143,11 +6273,13 @@ phutil_register_library_map(array(
     'PhabricatorBadgesListController' => 'PhabricatorBadgesController',
     'PhabricatorBadgesMailReceiver' => 'PhabricatorObjectMailReceiver',
     'PhabricatorBadgesPHIDType' => 'PhabricatorPHIDType',
+    'PhabricatorBadgesQuality' => 'Phobject',
     'PhabricatorBadgesQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'PhabricatorBadgesRecipientsListView' => 'AphrontView',
     'PhabricatorBadgesRemoveRecipientsController' => 'PhabricatorBadgesController',
     'PhabricatorBadgesReplyHandler' => 'PhabricatorApplicationTransactionReplyHandler',
     'PhabricatorBadgesSchemaSpec' => 'PhabricatorConfigSchemaSpec',
+    'PhabricatorBadgesSearchConduitAPIMethod' => 'PhabricatorSearchEngineAPIMethod',
     'PhabricatorBadgesSearchEngine' => 'PhabricatorApplicationSearchEngine',
     'PhabricatorBadgesTransaction' => 'PhabricatorApplicationTransaction',
     'PhabricatorBadgesTransactionComment' => 'PhabricatorApplicationTransactionComment',
@@ -6179,6 +6311,7 @@ phutil_register_library_map(array(
     'PhabricatorBritishEnglishTranslation' => 'PhutilTranslation',
     'PhabricatorBuildbotController' => 'PhabricatorController',
     'PhabricatorBuiltinPatchList' => 'PhabricatorSQLPatchList',
+    'PhabricatorBulkContentSource' => 'PhabricatorContentSource',
     'PhabricatorBusyUIExample' => 'PhabricatorUIExample',
     'PhabricatorCacheDAO' => 'PhabricatorLiskDAO',
     'PhabricatorCacheGeneralGarbageCollector' => 'PhabricatorGarbageCollector',
@@ -6274,6 +6407,7 @@ phutil_register_library_map(array(
     'PhabricatorConduitCertificateToken' => 'PhabricatorConduitDAO',
     'PhabricatorConduitConnectionLog' => 'PhabricatorConduitDAO',
     'PhabricatorConduitConsoleController' => 'PhabricatorConduitController',
+    'PhabricatorConduitContentSource' => 'PhabricatorContentSource',
     'PhabricatorConduitController' => 'PhabricatorController',
     'PhabricatorConduitDAO' => 'PhabricatorLiskDAO',
     'PhabricatorConduitEditField' => 'PhabricatorEditField',
@@ -6374,7 +6508,9 @@ phutil_register_library_map(array(
     'PhabricatorConpherencePreferencesSettingsPanel' => 'PhabricatorSettingsPanel',
     'PhabricatorConpherenceThreadPHIDType' => 'PhabricatorPHIDType',
     'PhabricatorConsoleApplication' => 'PhabricatorApplication',
+    'PhabricatorConsoleContentSource' => 'PhabricatorContentSource',
     'PhabricatorContentSource' => 'Phobject',
+    'PhabricatorContentSourceModule' => 'PhabricatorConfigModule',
     'PhabricatorContentSourceView' => 'AphrontView',
     'PhabricatorContributedToObjectEdgeType' => 'PhabricatorEdgeType',
     'PhabricatorController' => 'AphrontController',
@@ -6440,6 +6576,7 @@ phutil_register_library_map(array(
     'PhabricatorDaemonBulkJobMonitorController' => 'PhabricatorDaemonController',
     'PhabricatorDaemonBulkJobViewController' => 'PhabricatorDaemonController',
     'PhabricatorDaemonConsoleController' => 'PhabricatorDaemonController',
+    'PhabricatorDaemonContentSource' => 'PhabricatorContentSource',
     'PhabricatorDaemonController' => 'PhabricatorController',
     'PhabricatorDaemonDAO' => 'PhabricatorLiskDAO',
     'PhabricatorDaemonEventListener' => 'PhabricatorEventListener',
@@ -6490,7 +6627,6 @@ phutil_register_library_map(array(
     'PhabricatorDashboardDashboardHasPanelEdgeType' => 'PhabricatorEdgeType',
     'PhabricatorDashboardDashboardPHIDType' => 'PhabricatorPHIDType',
     'PhabricatorDashboardEditController' => 'PhabricatorDashboardController',
-    'PhabricatorDashboardHistoryController' => 'PhabricatorDashboardController',
     'PhabricatorDashboardInstall' => 'PhabricatorDashboardDAO',
     'PhabricatorDashboardInstallController' => 'PhabricatorDashboardController',
     'PhabricatorDashboardLayoutConfig' => 'Phobject',
@@ -6631,6 +6767,7 @@ phutil_register_library_map(array(
     'PhabricatorElasticFulltextStorageEngine' => 'PhabricatorFulltextStorageEngine',
     'PhabricatorElasticSearchSetupCheck' => 'PhabricatorSetupCheck',
     'PhabricatorEmailAddressesSettingsPanel' => 'PhabricatorSettingsPanel',
+    'PhabricatorEmailContentSource' => 'PhabricatorContentSource',
     'PhabricatorEmailFormatSettingsPanel' => 'PhabricatorSettingsPanel',
     'PhabricatorEmailLoginController' => 'PhabricatorAuthController',
     'PhabricatorEmailPreferencesSettingsPanel' => 'PhabricatorSettingsPanel',
@@ -6678,6 +6815,7 @@ phutil_register_library_map(array(
     'PhabricatorFactSimpleSpec' => 'PhabricatorFactSpec',
     'PhabricatorFactSpec' => 'Phobject',
     'PhabricatorFactUpdateIterator' => 'PhutilBufferedIterator',
+    'PhabricatorFaxContentSource' => 'PhabricatorContentSource',
     'PhabricatorFeedApplication' => 'PhabricatorApplication',
     'PhabricatorFeedBuilder' => 'Phobject',
     'PhabricatorFeedConfigOptions' => 'PhabricatorApplicationConfigOptions',
@@ -6707,6 +6845,7 @@ phutil_register_library_map(array(
       'PhabricatorPolicyInterface',
       'PhabricatorDestructibleInterface',
     ),
+    'PhabricatorFileAccessTemporaryTokenType' => 'PhabricatorAuthTemporaryTokenType',
     'PhabricatorFileBundleLoader' => 'Phobject',
     'PhabricatorFileChunk' => array(
       'PhabricatorFileDAO',
@@ -6826,6 +6965,7 @@ phutil_register_library_map(array(
     'PhabricatorHandlePool' => 'Phobject',
     'PhabricatorHandlePoolTestCase' => 'PhabricatorTestCase',
     'PhabricatorHandleQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
+    'PhabricatorHandleRemarkupRule' => 'PhutilRemarkupRule',
     'PhabricatorHandlesEditField' => 'PhabricatorPHIDListEditField',
     'PhabricatorHarbormasterApplication' => 'PhabricatorApplication',
     'PhabricatorHarbormasterConfigOptions' => 'PhabricatorApplicationConfigOptions',
@@ -6838,6 +6978,7 @@ phutil_register_library_map(array(
     'PhabricatorHelpKeyboardShortcutController' => 'PhabricatorHelpController',
     'PhabricatorHelpMainMenuBarExtension' => 'PhabricatorMainMenuBarExtension',
     'PhabricatorHeraldApplication' => 'PhabricatorApplication',
+    'PhabricatorHeraldContentSource' => 'PhabricatorContentSource',
     'PhabricatorHighSecurityRequestExceptionHandler' => 'PhabricatorRequestExceptionHandler',
     'PhabricatorHomeApplication' => 'PhabricatorApplication',
     'PhabricatorHomeController' => 'PhabricatorController',
@@ -6872,6 +7013,7 @@ phutil_register_library_map(array(
     'PhabricatorInvalidConfigSetupCheck' => 'PhabricatorSetupCheck',
     'PhabricatorIteratedMD5PasswordHasher' => 'PhabricatorPasswordHasher',
     'PhabricatorIteratedMD5PasswordHasherTestCase' => 'PhabricatorTestCase',
+    'PhabricatorIteratorFileUploadSource' => 'PhabricatorFileUploadSource',
     'PhabricatorJIRAAuthProvider' => 'PhabricatorOAuth1AuthProvider',
     'PhabricatorJavelinLinter' => 'ArcanistLinter',
     'PhabricatorJiraIssueHasObjectEdgeType' => 'PhabricatorEdgeType',
@@ -6885,6 +7027,7 @@ phutil_register_library_map(array(
     'PhabricatorLibraryTestCase' => 'PhutilLibraryTestCase',
     'PhabricatorLinkProfilePanel' => 'PhabricatorProfilePanel',
     'PhabricatorLipsumArtist' => 'Phobject',
+    'PhabricatorLipsumContentSource' => 'PhabricatorContentSource',
     'PhabricatorLipsumGenerateWorkflow' => 'PhabricatorLipsumManagementWorkflow',
     'PhabricatorLipsumManagementWorkflow' => 'PhabricatorManagementWorkflow',
     'PhabricatorLipsumMondrianArtist' => 'PhabricatorLipsumArtist',
@@ -7060,6 +7203,7 @@ phutil_register_library_map(array(
     'PhabricatorNotificationsApplication' => 'PhabricatorApplication',
     'PhabricatorNuanceApplication' => 'PhabricatorApplication',
     'PhabricatorOAuth1AuthProvider' => 'PhabricatorOAuthAuthProvider',
+    'PhabricatorOAuth1SecretTemporaryTokenType' => 'PhabricatorAuthTemporaryTokenType',
     'PhabricatorOAuth2AuthProvider' => 'PhabricatorOAuthAuthProvider',
     'PhabricatorOAuthAuthProvider' => 'PhabricatorAuthProvider',
     'PhabricatorOAuthClientAuthorization' => array(
@@ -7068,10 +7212,11 @@ phutil_register_library_map(array(
     ),
     'PhabricatorOAuthClientAuthorizationQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'PhabricatorOAuthClientController' => 'PhabricatorOAuthServerController',
-    'PhabricatorOAuthClientDeleteController' => 'PhabricatorOAuthClientController',
+    'PhabricatorOAuthClientDisableController' => 'PhabricatorOAuthClientController',
     'PhabricatorOAuthClientEditController' => 'PhabricatorOAuthClientController',
     'PhabricatorOAuthClientListController' => 'PhabricatorOAuthClientController',
     'PhabricatorOAuthClientSecretController' => 'PhabricatorOAuthClientController',
+    'PhabricatorOAuthClientTestController' => 'PhabricatorOAuthClientController',
     'PhabricatorOAuthClientViewController' => 'PhabricatorOAuthClientController',
     'PhabricatorOAuthResponse' => 'AphrontResponse',
     'PhabricatorOAuthServer' => 'Phobject',
@@ -7083,6 +7228,7 @@ phutil_register_library_map(array(
     'PhabricatorOAuthServerClient' => array(
       'PhabricatorOAuthServerDAO',
       'PhabricatorPolicyInterface',
+      'PhabricatorApplicationTransactionInterface',
       'PhabricatorDestructibleInterface',
     ),
     'PhabricatorOAuthServerClientAuthorizationPHIDType' => 'PhabricatorPHIDType',
@@ -7092,10 +7238,13 @@ phutil_register_library_map(array(
     'PhabricatorOAuthServerController' => 'PhabricatorController',
     'PhabricatorOAuthServerCreateClientsCapability' => 'PhabricatorPolicyCapability',
     'PhabricatorOAuthServerDAO' => 'PhabricatorLiskDAO',
+    'PhabricatorOAuthServerEditEngine' => 'PhabricatorEditEngine',
+    'PhabricatorOAuthServerEditor' => 'PhabricatorApplicationTransactionEditor',
     'PhabricatorOAuthServerScope' => 'Phobject',
     'PhabricatorOAuthServerTestCase' => 'PhabricatorTestCase',
-    'PhabricatorOAuthServerTestController' => 'PhabricatorOAuthServerController',
     'PhabricatorOAuthServerTokenController' => 'PhabricatorOAuthServerController',
+    'PhabricatorOAuthServerTransaction' => 'PhabricatorApplicationTransaction',
+    'PhabricatorOAuthServerTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
     'PhabricatorObjectHandle' => array(
       'Phobject',
       'PhabricatorPolicyInterface',
@@ -7119,6 +7268,7 @@ phutil_register_library_map(array(
     'PhabricatorObjectSelectorDialog' => 'Phobject',
     'PhabricatorObjectUsesCredentialsEdgeType' => 'PhabricatorEdgeType',
     'PhabricatorOffsetPagedQuery' => 'PhabricatorQuery',
+    'PhabricatorOldWorldContentSource' => 'PhabricatorContentSource',
     'PhabricatorOneTimeTriggerClock' => 'PhabricatorTriggerClock',
     'PhabricatorOpcodeCacheSpec' => 'PhabricatorCacheSpec',
     'PhabricatorOwnerPathQuery' => 'Phobject',
@@ -7276,6 +7426,7 @@ phutil_register_library_map(array(
     'PhabricatorPholioConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorPholioMockTestDataGenerator' => 'PhabricatorTestDataGenerator',
     'PhabricatorPhortuneApplication' => 'PhabricatorApplication',
+    'PhabricatorPhortuneContentSource' => 'PhabricatorContentSource',
     'PhabricatorPhortuneManagementInvoiceWorkflow' => 'PhabricatorPhortuneManagementWorkflow',
     'PhabricatorPhortuneManagementWorkflow' => 'PhabricatorManagementWorkflow',
     'PhabricatorPhragmentApplication' => 'PhabricatorApplication',
@@ -7512,6 +7663,7 @@ phutil_register_library_map(array(
     'PhabricatorProjectWatcherListView' => 'PhabricatorProjectUserListView',
     'PhabricatorProjectWorkboardBackgroundColor' => 'Phobject',
     'PhabricatorProjectWorkboardProfilePanel' => 'PhabricatorProfilePanel',
+    'PhabricatorProjectsCurtainExtension' => 'PHUICurtainExtension',
     'PhabricatorProjectsEditEngineExtension' => 'PhabricatorEditEngineExtension',
     'PhabricatorProjectsEditField' => 'PhabricatorTokenizerEditField',
     'PhabricatorProjectsFulltextEngineExtension' => 'PhabricatorFulltextEngineExtension',
@@ -7571,6 +7723,7 @@ phutil_register_library_map(array(
       'PhabricatorSubscribableInterface',
       'PhabricatorMentionableInterface',
       'HarbormasterBuildableInterface',
+      'HarbormasterCircleCIBuildableInterface',
       'PhabricatorCustomFieldInterface',
       'PhabricatorApplicationTransactionInterface',
       'PhabricatorFulltextInterface',
@@ -7590,6 +7743,12 @@ phutil_register_library_map(array(
     'PhabricatorRepositoryEngine' => 'Phobject',
     'PhabricatorRepositoryGitCommitChangeParserWorker' => 'PhabricatorRepositoryCommitChangeParserWorker',
     'PhabricatorRepositoryGitCommitMessageParserWorker' => 'PhabricatorRepositoryCommitMessageParserWorker',
+    'PhabricatorRepositoryGitLFSRef' => array(
+      'PhabricatorRepositoryDAO',
+      'PhabricatorPolicyInterface',
+      'PhabricatorDestructibleInterface',
+    ),
+    'PhabricatorRepositoryGitLFSRefQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'PhabricatorRepositoryGraphCache' => 'Phobject',
     'PhabricatorRepositoryGraphStream' => 'Phobject',
     'PhabricatorRepositoryManagementCacheWorkflow' => 'PhabricatorRepositoryManagementWorkflow',
@@ -7882,6 +8041,7 @@ phutil_register_library_map(array(
     'PhabricatorSubscriptionsAddSelfHeraldAction' => 'PhabricatorSubscriptionsHeraldAction',
     'PhabricatorSubscriptionsAddSubscribersHeraldAction' => 'PhabricatorSubscriptionsHeraldAction',
     'PhabricatorSubscriptionsApplication' => 'PhabricatorApplication',
+    'PhabricatorSubscriptionsCurtainExtension' => 'PHUICurtainExtension',
     'PhabricatorSubscriptionsEditController' => 'PhabricatorController',
     'PhabricatorSubscriptionsEditEngineExtension' => 'PhabricatorEditEngineExtension',
     'PhabricatorSubscriptionsEditor' => 'PhabricatorEditor',
@@ -7955,6 +8115,7 @@ phutil_register_library_map(array(
     'PhabricatorTokenUIEventListener' => 'PhabricatorEventListener',
     'PhabricatorTokenizerEditField' => 'PhabricatorPHIDListEditField',
     'PhabricatorTokensApplication' => 'PhabricatorApplication',
+    'PhabricatorTokensCurtainExtension' => 'PHUICurtainExtension',
     'PhabricatorTokensSettingsPanel' => 'PhabricatorSettingsPanel',
     'PhabricatorTooltipUIExample' => 'PhabricatorUIExample',
     'PhabricatorTransactions' => 'Phobject',
@@ -7986,7 +8147,9 @@ phutil_register_library_map(array(
     'PhabricatorUIExampleRenderController' => 'PhabricatorController',
     'PhabricatorUIExamplesApplication' => 'PhabricatorApplication',
     'PhabricatorUSEnglishTranslation' => 'PhutilTranslation',
+    'PhabricatorUnitTestContentSource' => 'PhabricatorContentSource',
     'PhabricatorUnitsTestCase' => 'PhabricatorTestCase',
+    'PhabricatorUnknownContentSource' => 'PhabricatorContentSource',
     'PhabricatorUnsubscribedFromObjectEdgeType' => 'PhabricatorEdgeType',
     'PhabricatorUser' => array(
       'PhabricatorUserDAO',
@@ -8042,6 +8205,7 @@ phutil_register_library_map(array(
     'PhabricatorVeryWowEnglishTranslation' => 'PhutilTranslation',
     'PhabricatorViewerDatasource' => 'PhabricatorTypeaheadDatasource',
     'PhabricatorWatcherHasObjectEdgeType' => 'PhabricatorEdgeType',
+    'PhabricatorWebContentSource' => 'PhabricatorContentSource',
     'PhabricatorWordPressAuthProvider' => 'PhabricatorOAuth2AuthProvider',
     'PhabricatorWorker' => 'Phobject',
     'PhabricatorWorkerActiveTask' => 'PhabricatorWorkerTask',
@@ -8441,6 +8605,7 @@ phutil_register_library_map(array(
     'PhragmentZIPController' => 'PhragmentController',
     'PhrequentConduitAPIMethod' => 'ConduitAPIMethod',
     'PhrequentController' => 'PhabricatorController',
+    'PhrequentCurtainExtension' => 'PHUICurtainExtension',
     'PhrequentDAO' => 'PhabricatorLiskDAO',
     'PhrequentListController' => 'PhrequentController',
     'PhrequentPopConduitAPIMethod' => 'PhrequentConduitAPIMethod',

src/aphront/configuration/AphrontDefaultApplicationConfiguration.php

@@ -25,11 +25,18 @@ class AphrontDefaultApplicationConfiguration
     $content_type = idx($_SERVER, 'CONTENT_TYPE');
     $is_form_data = preg_match('@^multipart/form-data@i', $content_type);
 
-    $raw_input = PhabricatorStartup::getRawInput();
+    $request_method = idx($_SERVER, 'REQUEST_METHOD');
-    if (strlen($raw_input) && !$is_form_data) {
+    if ($request_method === 'PUT') {
-      $data += $parser->parseQueryString($raw_input);
+      // For PUT requests, do nothing: in particular, do NOT read input. This
-    } else if ($_POST) {
+      // allows us to stream input later and process very large PUT requests,
-      $data += $_POST;
+      // like those coming from Git LFS.
+    } else {
+      $raw_input = PhabricatorStartup::getRawInput();
+      if (strlen($raw_input) && !$is_form_data) {
+        $data += $parser->parseQueryString($raw_input);
+      } else if ($_POST) {
+        $data += $_POST;
+      }
     }
 
     $data += $parser->parseQueryString(idx($_SERVER, 'QUERY_STRING', ''));

src/applications/almanac/controller/AlmanacBindingEditController.php

@@ -99,25 +99,35 @@ final class AlmanacBindingEditController
 
     $box = id(new PHUIObjectBoxView())
       ->setValidationException($validation_exception)
-      ->setHeaderText($title)
+      ->setHeaderText(pht('Binding'))
+      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
       ->appendChild($form);
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb($service->getName(), $service_uri);
     if ($is_new) {
       $crumbs->addTextCrumb(pht('Create Binding'));
+      $header = id(new PHUIHeaderView())
+        ->setHeader(pht('Create Binding'))
+        ->setHeaderIcon('fa-plus-square');
     } else {
       $crumbs->addTextCrumb(pht('Edit Binding'));
+      $header = id(new PHUIHeaderView())
+        ->setHeader(pht('Create Binding'))
+        ->setHeaderIcon('fa-pencil');
     }
+    $crumbs->setBorder(true);
+
+    $view = id(new PHUITwoColumnView())
+      ->setHeader($header)
+      ->setFooter(array(
+        $box,
+      ));
 
     return $this->newPage()
       ->setTitle($title)
       ->setCrumbs($crumbs)
-      ->appendChild(
+      ->appendChild($view);
-        array(
-          $box,
-      ));
-
   }
 
 }

src/applications/almanac/controller/AlmanacBindingViewController.php

@@ -26,26 +26,23 @@ final class AlmanacBindingViewController
 
     $title = pht('Binding %s', $binding->getID());
 
-    $property_list = $this->buildPropertyList($binding);
+    $properties = $this->buildPropertyList($binding);
-    $action_list = $this->buildActionList($binding);
+    $details = $this->buildPropertySection($binding);
-    $property_list->setActionList($action_list);
+    $curtain = $this->buildCurtain($binding);
 
     $header = id(new PHUIHeaderView())
       ->setUser($viewer)
       ->setHeader($title)
-      ->setPolicyObject($binding);
+      ->setPolicyObject($binding)
+      ->setHeaderIcon('fa-object-group');
 
     if ($binding->getIsDisabled()) {
       $header->setStatus('fa-ban', 'red', pht('Disabled'));
     }
 
-    $box = id(new PHUIObjectBoxView())
+    $issue = null;
-      ->setHeader($header)
-      ->addPropertyList($property_list);
-
     if ($binding->getService()->isClusterService()) {
-      $this->addClusterMessage(
+      $issue = $this->addClusterMessage(
-        $box,
         pht('The service for this binding is a cluster service.'),
         pht(
           'The service for this binding is a cluster service. You do not '.
@@ -56,24 +53,33 @@ final class AlmanacBindingViewController
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb($service->getName(), $service_uri);
     $crumbs->addTextCrumb($title);
+    $crumbs->setBorder(true);
 
     $timeline = $this->buildTransactionTimeline(
       $binding,
       new AlmanacBindingTransactionQuery());
     $timeline->setShouldTerminate(true);
 
+    $view = id(new PHUITwoColumnView())
+      ->setHeader($header)
+      ->setCurtain($curtain)
+      ->setMainColumn(array(
+          $issue,
+          $this->buildAlmanacPropertiesTable($binding),
+          $timeline,
+        ))
+      ->addPropertySection(pht('DETAILS'), $details);
+
     return $this->newPage()
       ->setTitle($title)
       ->setCrumbs($crumbs)
       ->appendChild(
         array(
-          $box,
+          $view,
-          $this->buildAlmanacPropertiesTable($binding),
-          $timeline,
       ));
   }
 
-  private function buildPropertyList(AlmanacBinding $binding) {
+  private function buildPropertySection(AlmanacBinding $binding) {
     $viewer = $this->getViewer();
 
     $properties = id(new PHUIPropertyListView())
@@ -98,23 +104,36 @@ final class AlmanacBindingViewController
     return $properties;
   }
 
-  private function buildActionList(AlmanacBinding $binding) {
+  private function buildPropertyList(AlmanacBinding $binding) {
+    $viewer = $this->getViewer();
+
+    $properties = id(new PHUIPropertyListView())
+      ->setUser($viewer)
+      ->setObject($binding);
+    $properties->invokeWillRenderEvent();
+
+    return $properties;
+  }
+
+  private function buildCurtain(AlmanacBinding $binding) {
     $viewer = $this->getViewer();
-    $id = $binding->getID();
 
     $can_edit = PhabricatorPolicyFilter::hasCapability(
       $viewer,
       $binding,
       PhabricatorPolicyCapability::CAN_EDIT);
 
-    $actions = id(new PhabricatorActionListView())
+    $id = $binding->getID();
-      ->setUser($viewer);
+    $edit_uri = $this->getApplicationURI("binding/edit/{$id}/");
+    $disable_uri = $this->getApplicationURI("binding/disable/{$id}/");
 
-    $actions->addAction(
+    $curtain = $this->newCurtainView($binding);
+
+    $curtain->addAction(
       id(new PhabricatorActionView())
         ->setIcon('fa-pencil')
         ->setName(pht('Edit Binding'))
-        ->setHref($this->getApplicationURI("binding/edit/{$id}/"))
+        ->setHref($edit_uri)
         ->setWorkflow(!$can_edit)
         ->setDisabled(!$can_edit));
 
@@ -126,17 +145,15 @@ final class AlmanacBindingViewController
       $disable_text = pht('Disable Binding');
     }
 
-    $disable_href = $this->getApplicationURI("binding/disable/{$id}/");
+    $curtain->addAction(
-
-    $actions->addAction(
       id(new PhabricatorActionView())
         ->setIcon($disable_icon)
         ->setName($disable_text)
-        ->setHref($disable_href)
+        ->setHref($disable_uri)
         ->setWorkflow(true)
         ->setDisabled(!$can_edit));
 
-    return $actions;
+    return $curtain;
   }
 
 }

src/applications/almanac/controller/AlmanacConsoleController.php

@@ -61,18 +61,25 @@ final class AlmanacConsoleController extends AlmanacController {
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb(pht('Console'));
+    $crumbs->setBorder(true);
 
     $box = id(new PHUIObjectBoxView())
-      ->setHeaderText(pht('Console'))
       ->setObjectList($menu);
 
+    $header = id(new PHUIHeaderView())
+      ->setHeader(pht('Almanac Console'))
+      ->setHeaderIcon('fa-server');
+
+    $view = id(new PHUITwoColumnView())
+      ->setHeader($header)
+      ->setFooter(array(
+        $box,
+      ));
+
     return $this->newPage()
       ->setTitle(pht('Almanac Console'))
       ->setCrumbs($crumbs)
-      ->appendChild(
+      ->appendChild($view);
-        array(
-          $box,
-      ));
 
   }
 

src/applications/almanac/controller/AlmanacDeviceViewController.php

@@ -23,8 +23,7 @@ final class AlmanacDeviceViewController
 
     $title = pht('Device %s', $device->getName());
 
-    $properties = $this->buildPropertyList($device);
+    $curtain = $this->buildCurtain($device);
-    $actions = $this->buildActionList($device);
 
     $header = id(new PHUIHeaderView())
       ->setUser($viewer)
@@ -55,6 +54,7 @@ final class AlmanacDeviceViewController
 
     $view = id(new PHUITwoColumnView())
       ->setHeader($header)
+      ->setCurtain($curtain)
       ->setMainColumn(array(
           $issue,
           $interfaces,
@@ -62,9 +62,7 @@ final class AlmanacDeviceViewController
           $this->buildSSHKeysTable($device),
           $this->buildServicesTable($device),
           $timeline,
-        ))
+        ));
-      ->setPropertyList($properties)
-      ->setActionList($actions);
 
     return $this->newPage()
       ->setTitle($title)
@@ -75,37 +73,28 @@ final class AlmanacDeviceViewController
         ));
   }
 
-  private function buildPropertyList(AlmanacDevice $device) {
+  private function buildCurtain(AlmanacDevice $device) {
     $viewer = $this->getViewer();
 
-    $properties = id(new PHUIPropertyListView())
-      ->setUser($viewer)
-      ->setObject($device);
-
-    return $properties;
-  }
-
-  private function buildActionList(AlmanacDevice $device) {
-    $viewer = $this->getViewer();
-    $id = $device->getID();
-
     $can_edit = PhabricatorPolicyFilter::hasCapability(
       $viewer,
       $device,
       PhabricatorPolicyCapability::CAN_EDIT);
 
-    $actions = id(new PhabricatorActionListView())
+    $id = $device->getID();
-      ->setUser($viewer);
+    $edit_uri = $this->getApplicationURI("device/edit/{$id}/");
 
-    $actions->addAction(
+    $curtain = $this->newCurtainView($device);
+
+    $curtain->addAction(
       id(new PhabricatorActionView())
         ->setIcon('fa-pencil')
         ->setName(pht('Edit Device'))
-        ->setHref($this->getApplicationURI("device/edit/{$id}/"))
+        ->setHref($edit_uri)
         ->setWorkflow(!$can_edit)
         ->setDisabled(!$can_edit));
 
-    return $actions;
+    return $curtain;
   }
 
   private function buildInterfaceList(AlmanacDevice $device) {

src/applications/almanac/controller/AlmanacInterfaceEditController.php

@@ -131,24 +131,36 @@ final class AlmanacInterfaceEditController
 
     $box = id(new PHUIObjectBoxView())
       ->setValidationException($validation_exception)
-      ->setHeaderText($title)
+      ->setHeaderText(pht('Interface'))
+      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
       ->setForm($form);
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb($device->getName(), $device_uri);
     if ($is_new) {
       $crumbs->addTextCrumb(pht('Create Interface'));
+      $header = id(new PHUIHeaderView())
+        ->setHeader(pht('Create Interface'))
+        ->setHeaderIcon('fa-plus-square');
     } else {
       $crumbs->addTextCrumb(pht('Edit Interface'));
+      $header = id(new PHUIHeaderView())
+        ->setHeader(pht('Edit Interface'))
+        ->setHeaderIcon('fa-pencil');
     }
+    $crumbs->setBorder(true);
+
+    $view = id(new PHUITwoColumnView())
+      ->setHeader($header)
+      ->setFooter(array(
+        $box,
+      ));
 
     return $this->newPage()
       ->setTitle($title)
       ->setCrumbs($crumbs)
-      ->appendChild(
+      ->appendChild($view);
-        array(
+
-          $box,
-      ));
   }
 
 }

src/applications/almanac/controller/AlmanacNamespaceViewController.php

@@ -21,8 +21,7 @@ final class AlmanacNamespaceViewController
 
     $title = pht('Namespace %s', $namespace->getName());
 
-    $properties = $this->buildPropertyList($namespace);
+    $curtain = $this->buildCurtain($namespace);
-    $actions = $this->buildActionList($namespace);
 
     $header = id(new PHUIHeaderView())
       ->setUser($viewer)
@@ -41,11 +40,10 @@ final class AlmanacNamespaceViewController
 
     $view = id(new PHUITwoColumnView())
       ->setHeader($header)
+      ->setCurtain($curtain)
       ->setMainColumn(array(
           $timeline,
-        ))
+        ));
-      ->setPropertyList($properties)
-      ->setActionList($actions);
 
     return $this->newPage()
       ->setTitle($title)
@@ -56,39 +54,28 @@ final class AlmanacNamespaceViewController
         ));
   }
 
-  private function buildPropertyList(AlmanacNamespace $namespace) {
+  private function buildCurtain(AlmanacNamespace $namespace) {
     $viewer = $this->getViewer();
 
-    $properties = id(new PHUIPropertyListView())
-      ->setUser($viewer)
-      ->setObject($namespace);
-
-    $properties->invokeWillRenderEvent();
-
-    return $properties;
-  }
-
-  private function buildActionList(AlmanacNamespace $namespace) {
-    $viewer = $this->getViewer();
-    $id = $namespace->getID();
-
     $can_edit = PhabricatorPolicyFilter::hasCapability(
       $viewer,
       $namespace,
       PhabricatorPolicyCapability::CAN_EDIT);
 
-    $actions = id(new PhabricatorActionListView())
+    $id = $namespace->getID();
-      ->setUser($viewer);
+    $edit_uri = $this->getApplicationURI("namespace/edit/{$id}/");
 
-    $actions->addAction(
+    $curtain = $this->newCurtainView($namespace);
+
+    $curtain->addAction(
       id(new PhabricatorActionView())
         ->setIcon('fa-pencil')
         ->setName(pht('Edit Namespace'))
-        ->setHref($this->getApplicationURI("namespace/edit/{$id}/"))
+        ->setHref($edit_uri)
         ->setWorkflow(!$can_edit)
         ->setDisabled(!$can_edit));
 
-    return $actions;
+    return $curtain;
   }
 
 }

src/applications/almanac/controller/AlmanacNetworkViewController.php

@@ -21,8 +21,7 @@ final class AlmanacNetworkViewController
 
     $title = pht('Network %s', $network->getName());
 
-    $properties = $this->buildPropertyList($network);
+    $curtain = $this->buildCurtain($network);
-    $actions = $this->buildActionList($network);
 
     $header = id(new PHUIHeaderView())
       ->setUser($viewer)
@@ -41,11 +40,10 @@ final class AlmanacNetworkViewController
 
     $view = id(new PHUITwoColumnView())
       ->setHeader($header)
+      ->setCurtain($curtain)
       ->setMainColumn(array(
           $timeline,
-        ))
+        ));
-      ->setPropertyList($properties)
-      ->setActionList($actions);
 
     return $this->newPage()
       ->setTitle($title)
@@ -56,39 +54,29 @@ final class AlmanacNetworkViewController
       ));
   }
 
-  private function buildPropertyList(AlmanacNetwork $network) {
+
+  private function buildCurtain(AlmanacNetwork $network) {
     $viewer = $this->getViewer();
 
-    $properties = id(new PHUIPropertyListView())
-      ->setUser($viewer)
-      ->setObject($network);
-
-    $properties->invokeWillRenderEvent();
-
-    return $properties;
-  }
-
-  private function buildActionList(AlmanacNetwork $network) {
-    $viewer = $this->getViewer();
-    $id = $network->getID();
-
     $can_edit = PhabricatorPolicyFilter::hasCapability(
       $viewer,
       $network,
       PhabricatorPolicyCapability::CAN_EDIT);
 
-    $actions = id(new PhabricatorActionListView())
+    $id = $network->getID();
-      ->setUser($viewer);
+    $edit_uri = $this->getApplicationURI("network/edit/{$id}/");
 
-    $actions->addAction(
+    $curtain = $this->newCurtainView($network);
+
+    $curtain->addAction(
       id(new PhabricatorActionView())
         ->setIcon('fa-pencil')
         ->setName(pht('Edit Network'))
-        ->setHref($this->getApplicationURI("network/edit/{$id}/"))
+        ->setHref($edit_uri)
         ->setWorkflow(!$can_edit)
         ->setDisabled(!$can_edit));
 
-    return $actions;
+    return $curtain;
   }
 
 }

src/applications/almanac/controller/AlmanacServiceEditController.php

@@ -75,8 +75,12 @@ final class AlmanacServiceEditController
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb(pht('Create Service'));
+    $crumbs->setBorder(true);
 
     $title = pht('Choose Service Type');
+    $header = id(new PHUIHeaderView())
+      ->setHeader(pht('Create Service'))
+      ->setHeaderIcon('fa-plus-square');
 
     $form = id(new AphrontFormView())
       ->setUser($viewer)
@@ -88,13 +92,21 @@ final class AlmanacServiceEditController
 
     $box = id(new PHUIObjectBoxView())
       ->setFormErrors($errors)
-      ->setHeaderText($title)
+      ->setHeaderText(pht('Service'))
+      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
       ->setForm($form);
 
+    $view = id(new PHUITwoColumnView())
+      ->setHeader($header)
+      ->setFooter(array(
+        $box,
+      ));
+
     return $this->newPage()
       ->setTitle($title)
       ->setCrumbs($crumbs)
-      ->appendChild($box);
+      ->appendChild($view);
+
   }
 
 }

src/applications/almanac/controller/AlmanacServiceViewController.php

@@ -23,8 +23,7 @@ final class AlmanacServiceViewController
 
     $title = pht('Service %s', $service->getName());
 
-    $properties = $this->buildPropertyList($service);
+    $curtain = $this->buildCurtain($service);
-    $actions = $this->buildActionList($service);
     $details = $this->buildPropertySection($service);
 
     $header = id(new PHUIHeaderView())
@@ -55,36 +54,19 @@ final class AlmanacServiceViewController
 
     $view = id(new PHUITwoColumnView())
       ->setHeader($header)
+      ->setCurtain($curtain)
       ->setMainColumn(array(
           $issue,
           $details,
           $bindings,
           $this->buildAlmanacPropertiesTable($service),
           $timeline,
-        ))
+        ));
-      ->setPropertyList($properties)
-      ->setActionList($actions);
 
     return $this->newPage()
       ->setTitle($title)
       ->setCrumbs($crumbs)
-      ->appendChild(
+      ->appendChild($view);
-        array(
-          $view,
-        ));
-  }
-
-  private function buildPropertyList(
-    AlmanacService $service) {
-    $viewer = $this->getViewer();
-
-    $view = id(new PHUIPropertyListView())
-      ->setUser($viewer)
-      ->setObject($service);
-
-    $view->invokeWillRenderEvent();
-
-    return $view;
   }
 
   private function buildPropertySection(
@@ -104,27 +86,28 @@ final class AlmanacServiceViewController
       ->appendChild($properties);
   }
 
-  private function buildActionList(AlmanacService $service) {
+  private function buildCurtain(AlmanacService $service) {
     $viewer = $this->getViewer();
-    $id = $service->getID();
 
     $can_edit = PhabricatorPolicyFilter::hasCapability(
       $viewer,
       $service,
       PhabricatorPolicyCapability::CAN_EDIT);
 
-    $actions = id(new PhabricatorActionListView())
+    $id = $service->getID();
-      ->setUser($viewer);
+    $edit_uri = $this->getApplicationURI("service/edit/{$id}/");
 
-    $actions->addAction(
+    $curtain = $this->newCurtainView($service);
+
+    $curtain->addAction(
       id(new PhabricatorActionView())
         ->setIcon('fa-pencil')
         ->setName(pht('Edit Service'))
-        ->setHref($this->getApplicationURI("service/edit/{$id}/"))
+        ->setHref($edit_uri)
         ->setWorkflow(!$can_edit)
         ->setDisabled(!$can_edit));
 
-    return $actions;
+    return $curtain;
   }
 
   private function buildBindingList(AlmanacService $service) {

src/applications/almanac/editor/AlmanacBindingPropertyEditEngine.php

@@ -13,4 +13,8 @@ final class AlmanacBindingPropertyEditEngine
     return $object->getURI();
   }
 
+  protected function getObjectName() {
+    return pht('Property');
+  }
+
 }

src/applications/almanac/editor/AlmanacDeviceEditEngine.php

@@ -53,6 +53,10 @@ final class AlmanacDeviceEditEngine
     return pht('Create Device');
   }
 
+  protected function getObjectName() {
+    return pht('Device');
+  }
+
   protected function getEditorURI() {
     return '/almanac/device/edit/';
   }

src/applications/almanac/editor/AlmanacDevicePropertyEditEngine.php

@@ -13,4 +13,8 @@ final class AlmanacDevicePropertyEditEngine
     return $object->getURI();
   }
 
+  protected function getObjectName() {
+    return pht('Property');
+  }
+
 }

src/applications/almanac/editor/AlmanacNamespaceEditEngine.php

@@ -53,6 +53,10 @@ final class AlmanacNamespaceEditEngine
     return pht('Create Namespace');
   }
 
+  protected function getObjectName() {
+    return pht('Namespace');
+  }
+
   protected function getEditorURI() {
     return '/almanac/namespace/edit/';
   }

src/applications/almanac/editor/AlmanacNetworkEditEngine.php

@@ -53,6 +53,10 @@ final class AlmanacNetworkEditEngine
     return pht('Create Network');
   }
 
+  protected function getObjectName() {
+    return pht('Network');
+  }
+
   protected function getEditorURI() {
     return '/almanac/network/edit/';
   }

src/applications/almanac/editor/AlmanacServiceEditEngine.php

@@ -65,6 +65,10 @@ final class AlmanacServiceEditEngine
     return pht('Create Service');
   }
 
+  protected function getObjectName() {
+    return pht('Service');
+  }
+
   protected function getEditorURI() {
     return '/almanac/service/edit/';
   }

src/applications/almanac/editor/AlmanacServicePropertyEditEngine.php

@@ -13,4 +13,8 @@ final class AlmanacServicePropertyEditEngine
     return $object->getURI();
   }
 
+  protected function getObjectName() {
+    return pht('Property');
+  }
+
 }

src/applications/almanac/management/AlmanacManagementWorkflow.php

@@ -3,7 +3,6 @@
 abstract class AlmanacManagementWorkflow
   extends PhabricatorManagementWorkflow {
 
-
   protected function loadServices(array $names) {
     if (!$names) {
       return array();
@@ -37,7 +36,7 @@ abstract class AlmanacManagementWorkflow
     $editor = id(new AlmanacServiceEditor())
       ->setActor($this->getViewer())
       ->setActingAsPHID($almanac_phid)
-      ->setContentSource(PhabricatorContentSource::newConsoleSource())
+      ->setContentSource($this->newContentSource())
       ->setContinueOnMissingFields(true);
 
     $editor->applyTransactions($service, array($xaction));

src/applications/almanac/query/AlmanacServiceSearchEngine.php

@@ -15,10 +15,6 @@ final class AlmanacServiceSearchEngine
     return new AlmanacServiceQuery();
   }
 
-  public function newResultObject() {
-    return new AlmanacService();
-  }
-
   protected function buildQueryFromParameters(array $map) {
     $query = $this->newQuery();
 

src/applications/almanac/storage/AlmanacDevice.php

@@ -246,7 +246,7 @@ final class AlmanacDevice
   }
 
 
-/* -(  PhabricatorNgramInterface  )------------------------------------------ */
+/* -(  PhabricatorNgramsInterface  )----------------------------------------- */
 
 
   public function newNgrams() {

src/applications/almanac/storage/AlmanacNamespace.php

@@ -210,7 +210,7 @@ final class AlmanacNamespace
   }
 
 
-/* -(  PhabricatorNgramInterface  )------------------------------------------ */
+/* -(  PhabricatorNgramsInterface  )----------------------------------------- */
 
 
   public function newNgrams() {

src/applications/almanac/storage/AlmanacNetwork.php

@@ -116,7 +116,7 @@ final class AlmanacNetwork
   }
 
 
-/* -(  PhabricatorNgramInterface  )------------------------------------------ */
+/* -(  PhabricatorNgramsInterface  )----------------------------------------- */
 
 
   public function newNgrams() {

src/applications/almanac/storage/AlmanacService.php

@@ -251,7 +251,7 @@ final class AlmanacService
   }
 
 
-/* -(  PhabricatorNgramInterface  )------------------------------------------ */
+/* -(  PhabricatorNgramsInterface  )----------------------------------------- */
 
 
   public function newNgrams() {

src/applications/audit/constants/PhabricatorAuditCommitStatusConstants.php

@@ -37,9 +37,11 @@ final class PhabricatorAuditCommitStatusConstants extends Phobject {
         $color = 'red';
         break;
       case self::NEEDS_AUDIT:
-      case self::PARTIALLY_AUDITED:
         $color = 'orange';
         break;
+      case self::PARTIALLY_AUDITED:
+        $color = 'yellow';
+        break;
       case self::FULLY_AUDITED:
         $color = 'green';
         break;
@@ -53,11 +55,11 @@ final class PhabricatorAuditCommitStatusConstants extends Phobject {
     public static function getStatusIcon($code) {
     switch ($code) {
       case self::CONCERN_RAISED:
-        $icon = 'fa-exclamation-triangle';
+        $icon = 'fa-exclamation-circle';
         break;
       case self::NEEDS_AUDIT:
       case self::PARTIALLY_AUDITED:
-        $icon = 'fa-exclamation-triangle';
+        $icon = 'fa-exclamation-circle';
         break;
       case self::FULLY_AUDITED:
         $icon = 'fa-check';

src/applications/audit/editor/PhabricatorAuditEditor.php

@@ -636,6 +636,8 @@ final class PhabricatorAuditEditor
       }
     }
 
+    $phids[] = $this->getActingAsPHID();
+
     return $phids;
   }
 

src/applications/audit/storage/PhabricatorAuditInlineComment.php

@@ -34,8 +34,7 @@ final class PhabricatorAuditInlineComment
 
   public function getTransactionCommentForSave() {
     $content_source = PhabricatorContentSource::newForSource(
-      PhabricatorContentSource::SOURCE_LEGACY,
+      PhabricatorOldWorldContentSource::SOURCECONST);
-      array());
 
     $this->proxy
       ->setViewPolicy('public')

src/applications/audit/storage/PhabricatorAuditTransaction.php

@@ -117,12 +117,37 @@ final class PhabricatorAuditTransaction
             return 'red';
           case PhabricatorAuditActionConstants::ACCEPT:
             return 'green';
+          case PhabricatorAuditActionConstants::RESIGN:
+            return 'black';
+          case PhabricatorAuditActionConstants::CLOSE:
+            return 'indigo';
         }
     }
 
     return parent::getColor();
   }
 
+  public function getIcon() {
+
+    $type = $this->getTransactionType();
+
+    switch ($type) {
+      case PhabricatorAuditActionConstants::ACTION:
+        switch ($this->getNewValue()) {
+          case PhabricatorAuditActionConstants::CONCERN:
+            return 'fa-exclamation-circle';
+          case PhabricatorAuditActionConstants::ACCEPT:
+            return 'fa-check';
+          case PhabricatorAuditActionConstants::RESIGN:
+            return 'fa-plane';
+          case PhabricatorAuditActionConstants::CLOSE:
+            return 'fa-check';
+        }
+    }
+
+    return parent::getIcon();
+  }
+
   public function getTitle() {
     $old = $this->getOldValue();
     $new = $this->getNewValue();

src/applications/auth/conduit/PhabricatorAuthLogoutConduitAPIMethod.php

@@ -0,0 +1,51 @@
+<?php
+
+final class PhabricatorAuthLogoutConduitAPIMethod
+  extends PhabricatorAuthConduitAPIMethod {
+
+  public function getAPIMethodName() {
+    return 'auth.logout';
+  }
+
+  public function getMethodSummary() {
+    return pht('Terminate all login sessions.');
+  }
+
+  public function getMethodDescription() {
+    return pht(
+      'Terminate all web login sessions. If called via OAuth, also terminate '.
+      'the current OAuth token.'.
+      "\n\n".
+      'WARNING: This method does what it claims on the label. If you call '.
+      'this method via the test console in the web UI, it will log you out!');
+  }
+
+  protected function defineParamTypes() {
+    return array();
+  }
+
+  protected function defineReturnType() {
+    return 'void';
+  }
+
+  public function getRequiredScope() {
+    return self::SCOPE_ALWAYS;
+  }
+
+  protected function execute(ConduitAPIRequest $request) {
+    $viewer = $request->getUser();
+
+    // Destroy all web sessions.
+    $engine = id(new PhabricatorAuthSessionEngine());
+    $engine->terminateLoginSessions($viewer);
+
+    // If we were called via OAuth, destroy the OAuth token.
+    $oauth_token = $request->getOAuthToken();
+    if ($oauth_token) {
+      $oauth_token->delete();
+    }
+
+    return null;
+  }
+
+}

src/applications/auth/controller/PhabricatorAuthConfirmLinkController.php

@@ -66,15 +66,12 @@ final class PhabricatorAuthConfirmLinkController
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb(pht('Confirm Link'), $panel_uri);
     $crumbs->addTextCrumb($provider->getProviderName());
+    $crumbs->setBorder(true);
 
-    return $this->buildApplicationPage(
+    return $this->newPage()
-      array(
+      ->setTitle(pht('Confirm External Account Link'))
-        $crumbs,
+      ->setCrumbs($crumbs)
-        $dialog,
+      ->appendChild($dialog);
-      ),
-      array(
-        'title' => pht('Confirm External Account Link'),
-      ));
   }
 
 

src/applications/auth/controller/PhabricatorAuthController.php

@@ -7,11 +7,9 @@ abstract class PhabricatorAuthController extends PhabricatorController {
     $view->setTitle($title);
     $view->setErrors($messages);
 
-    return $this->buildApplicationPage(
+    return $this->newPage()
-      $view,
+      ->setTitle($title)
-      array(
+      ->appendChild($view);
-        'title' => $title,
-      ));
 
   }
 

src/applications/auth/controller/PhabricatorAuthLinkController.php

@@ -116,15 +116,12 @@ final class PhabricatorAuthLinkController
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb(pht('Link Account'), $panel_uri);
     $crumbs->addTextCrumb($provider->getProviderName($name));
+    $crumbs->setBorder(true);
 
-    return $this->buildApplicationPage(
+    return $this->newPage()
-      array(
+      ->setTitle($title)
-        $crumbs,
+      ->setCrumbs($crumbs)
-        $form,
+      ->appendChild($form);
-      ),
-      array(
-        'title' => $title,
-      ));
   }
 
 }

src/applications/auth/controller/PhabricatorAuthLoginController.php

@@ -236,7 +236,6 @@ final class PhabricatorAuthLoginController
     $content) {
 
     $crumbs = $this->buildApplicationCrumbs();
-    $crumbs->setBorder(true);
 
     if ($this->getRequest()->getUser()->isLoggedIn()) {
       $crumbs->addTextCrumb(pht('Link Account'), $provider->getSettingsURI());
@@ -245,15 +244,12 @@ final class PhabricatorAuthLoginController
     }
 
     $crumbs->addTextCrumb($provider->getProviderName());
+    $crumbs->setBorder(true);
 
-    return $this->buildApplicationPage(
+    return $this->newPage()
-      array(
+      ->setTitle(pht('Login'))
-        $crumbs,
+      ->setCrumbs($crumbs)
-        $content,
+      ->appendChild($content);
-      ),
-      array(
-        'title' => pht('Login'),
-      ));
   }
 
   public function buildProviderErrorResponse(

src/applications/auth/controller/PhabricatorAuthNeedsApprovalController.php

@@ -28,11 +28,10 @@ final class PhabricatorAuthNeedsApprovalController
       ->appendChild($wait_for_approval)
       ->addCancelButton('/', pht('Wait Patiently'));
 
-    return $this->buildApplicationPage(
+    return $this->newPage()
-      $dialog,
+      ->setTitle(pht('Wait For Approval'))
-      array(
+      ->appendChild($dialog);
-        'title' => pht('Wait For Approval'),
+
-      ));
   }
 
 }

src/applications/auth/controller/PhabricatorAuthNeedsMultiFactorController.php

@@ -76,15 +76,16 @@ final class PhabricatorAuthNeedsMultiFactorController
           ));
     }
 
-    return $this->buildApplicationPage(
+    $view = array(
-      array(
+      $help,
-        $crumbs,
+      $panel,
-        $help,
+    );
-        $panel,
+
-      ),
+    return $this->newPage()
-      array(
+      ->setTitle(pht('Add Multi-Factor Authentication'))
-        'title' => pht('Add Multi-Factor Authentication'),
+      ->setCrumbs($crumbs)
-      ));
+      ->appendChild($view);
+
   }
 
 }

src/applications/auth/controller/PhabricatorAuthOneTimeLoginController.php

@@ -105,23 +105,17 @@ final class PhabricatorAuthOneTimeLoginController
       // the link in the "Welcome" email is good enough, without requiring users
       // to go through a second round of email verification.
 
+      $editor = id(new PhabricatorUserEditor())
+        ->setActor($target_user);
+
       $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
         // Nuke the token and all other outstanding password reset tokens.
         // There is no particular security benefit to destroying them all, but
         // it should reduce HackerOne reports of nebulous harm.
-
+        $editor->revokePasswordResetLinks($target_user);
-        PhabricatorAuthTemporaryToken::revokeTokens(
-          $target_user,
-          array($target_user->getPHID()),
-          array(
-            PhabricatorAuthSessionEngine::ONETIME_TEMPORARY_TOKEN_TYPE,
-            PhabricatorAuthSessionEngine::PASSWORD_TEMPORARY_TOKEN_TYPE,
-          ));
 
         if ($target_email) {
-          id(new PhabricatorUserEditor())
+          $editor->verifyEmail($target_user, $target_email);
-            ->setActor($target_user)
-            ->verifyEmail($target_user, $target_email);
         }
       unset($unguarded);
 
@@ -133,12 +127,13 @@ final class PhabricatorAuthOneTimeLoginController
         // We're going to let the user reset their password without knowing
         // the old one. Generate a one-time token for that.
         $key = Filesystem::readRandomCharacters(16);
+        $password_type =
+          PhabricatorAuthPasswordResetTemporaryTokenType::TOKENTYPE;
 
         $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
           id(new PhabricatorAuthTemporaryToken())
-            ->setObjectPHID($target_user->getPHID())
+            ->setTokenResource($target_user->getPHID())
-            ->setTokenType(
+            ->setTokenType($password_type)
-              PhabricatorAuthSessionEngine::PASSWORD_TEMPORARY_TOKEN_TYPE)
             ->setTokenExpires(time() + phutil_units('1 hour in seconds'))
             ->setTokenCode(PhabricatorHash::digest($key))
             ->save();

src/applications/auth/controller/PhabricatorAuthRegisterController.php

@@ -505,6 +505,7 @@ final class PhabricatorAuthRegisterController
       $crumbs->addTextCrumb($provider->getProviderName());
         $title = pht('Phabricator Registration');
     }
+    $crumbs->setBorder(true);
 
     $welcome_view = null;
     if ($is_setup) {
@@ -519,7 +520,6 @@ final class PhabricatorAuthRegisterController
     }
 
     $object_box = id(new PHUIObjectBoxView())
-      ->setHeaderText($title)
       ->setForm($form)
       ->setFormErrors($errors);
 
@@ -528,16 +528,21 @@ final class PhabricatorAuthRegisterController
       $invite_header = $this->renderInviteHeader($invite);
     }
 
-    return $this->buildApplicationPage(
+    $header = id(new PHUIHeaderView())
-      array(
+      ->setHeader($title);
-        $crumbs,
+
-        $welcome_view,
+    $view = id(new PHUITwoColumnView())
-        $invite_header,
+      ->setHeader($header)
-        $object_box,
+      ->setFooter(array(
-      ),
+      $welcome_view,
-      array(
+      $invite_header,
-        'title' => $title,
+      $object_box,
-      ));
+    ));
+
+    return $this->newPage()
+      ->setTitle($title)
+      ->setCrumbs($crumbs)
+      ->appendChild($view);
   }
 
   private function loadDefaultAccount() {

src/applications/auth/controller/PhabricatorAuthRevokeTokenController.php

@@ -11,7 +11,7 @@ final class PhabricatorAuthRevokeTokenController
 
     $query = id(new PhabricatorAuthTemporaryTokenQuery())
       ->setViewer($viewer)
-      ->withObjectPHIDs(array($viewer->getPHID()));
+      ->withTokenResources(array($viewer->getPHID()));
     if (!$is_all) {
       $query->withIDs(array($id));
     }

src/applications/auth/controller/PhabricatorAuthStartController.php

@@ -29,6 +29,7 @@ final class PhabricatorAuthStartController
     // it and warn the user they may need to nuke their cookies.
 
     $session_token = $request->getCookie(PhabricatorCookies::COOKIE_SESSION);
+    $did_clear = $request->getStr('cleared');
 
     if (strlen($session_token)) {
       $kind = PhabricatorAuthSessionEngine::getSessionKindFromToken(
@@ -39,18 +40,34 @@ final class PhabricatorAuthStartController
           // be logged in, so we can just continue.
           break;
         default:
-          // The session cookie is invalid, so clear it.
+          // The session cookie is invalid, so try to clear it.
           $request->clearCookie(PhabricatorCookies::COOKIE_USERNAME);
           $request->clearCookie(PhabricatorCookies::COOKIE_SESSION);
 
-          return $this->renderError(
+          // We've previously tried to clear the cookie but we ended up back
-            pht(
+          // here, so it didn't work. Hard fatal instead of trying again.
-              'Your login session is invalid. Try reloading the page and '.
+          if ($did_clear) {
-              'logging in again. If that does not work, clear your browser '.
+            return $this->renderError(
-              'cookies.'));
+              pht(
+                'Your login session is invalid, and clearing the session '.
+                'cookie was unsuccessful. Try clearing your browser cookies.'));
+          }
+
+          $redirect_uri = $request->getRequestURI();
+          $redirect_uri->setQueryParam('cleared', 1);
+          return id(new AphrontRedirectResponse())->setURI($redirect_uri);
       }
     }
 
+    // If we just cleared the session cookie and it worked, clean up after
+    // ourselves by redirecting to get rid of the "cleared" parameter. The
+    // the workflow will continue normally.
+    if ($did_clear) {
+      $redirect_uri = $request->getRequestURI();
+      $redirect_uri->setQueryParam('cleared', null);
+      return id(new AphrontRedirectResponse())->setURI($redirect_uri);
+    }
+
     $providers = PhabricatorAuthProvider::getAllEnabledProviders();
     foreach ($providers as $key => $provider) {
       if (!$provider->shouldAllowLogin()) {
@@ -189,16 +206,17 @@ final class PhabricatorAuthStartController
     $crumbs->addTextCrumb(pht('Login'));
     $crumbs->setBorder(true);
 
-    return $this->buildApplicationPage(
+    $title = pht('Login to Phabricator');
-      array(
+    $view = array(
-        $crumbs,
+      $header,
-        $header,
+      $invite_message,
-        $invite_message,
+      $out,
-        $out,
+    );
-      ),
+
-      array(
+    return $this->newPage()
-        'title' => pht('Login to Phabricator'),
+      ->setTitle($title)
-      ));
+      ->setCrumbs($crumbs)
+      ->appendChild($view);
   }
 
 

src/applications/auth/controller/PhabricatorDisabledUserController.php

@@ -15,8 +15,7 @@ final class PhabricatorDisabledUserController
       return new Aphront404Response();
     }
 
-    return id(new AphrontDialogView())
+    return $this->newDialog()
-      ->setUser($viewer)
       ->setTitle(pht('Account Disabled'))
       ->addCancelButton('/logout/', pht('Okay'))
       ->appendParagraph(pht('Your account has been disabled.'));

src/applications/auth/controller/PhabricatorEmailLoginController.php

@@ -144,6 +144,7 @@ final class PhabricatorEmailLoginController
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb(pht('Reset Password'));
+    $crumbs->setBorder(true);
 
     $dialog = new AphrontDialogView();
     $dialog->setUser($request->getUser());
@@ -152,14 +153,11 @@ final class PhabricatorEmailLoginController
     $dialog->addSubmitButton(pht('Send Email'));
     $dialog->setSubmitURI('/login/email/');
 
-    return $this->buildApplicationPage(
+    return $this->newPage()
-      array(
+      ->setTitle(pht('Forgot Password'))
-        $crumbs,
+      ->setCrumbs($crumbs)
-        $dialog,
+      ->appendChild($dialog);
-      ),
+
-      array(
-        'title' => pht('Forgot Password'),
-      ));
   }
 
 }

src/applications/auth/controller/PhabricatorEmailVerificationController.php

@@ -77,15 +77,13 @@ final class PhabricatorEmailVerificationController
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb(pht('Verify Email'));
+    $crumbs->setBorder(true);
+
+    return $this->newPage()
+      ->setTitle(pht('Verify Email'))
+      ->setCrumbs($crumbs)
+      ->appendChild($dialog);
 
-    return $this->buildApplicationPage(
-      array(
-        $crumbs,
-        $dialog,
-      ),
-      array(
-        'title' => pht('Verify Email'),
-      ));
   }
 
 }

src/applications/auth/controller/PhabricatorLogoutController.php

@@ -29,13 +29,6 @@ final class PhabricatorLogoutController
     $viewer = $this->getViewer();
 
     if ($request->isFormPost()) {
-
-      $log = PhabricatorUserLog::initializeNewLog(
-        $viewer,
-        $viewer->getPHID(),
-        PhabricatorUserLog::ACTION_LOGOUT);
-      $log->save();
-
       // Destroy the user's session in the database so logout works even if
       // their cookies have some issues. We'll detect cookie issues when they
       // try to login again and tell them to clear any junk.
@@ -45,8 +38,10 @@ final class PhabricatorLogoutController
           ->setViewer($viewer)
           ->withSessionKeys(array($phsid))
           ->executeOne();
+
         if ($session) {
-          $session->delete();
+          $engine = new PhabricatorAuthSessionEngine();
+          $engine->logoutSession($viewer, $session);
         }
       }
       $request->clearCookie(PhabricatorCookies::COOKIE_SESSION);
@@ -56,14 +51,11 @@ final class PhabricatorLogoutController
     }
 
     if ($viewer->getPHID()) {
-      $dialog = id(new AphrontDialogView())
+      return $this->newDialog()
-        ->setUser($viewer)
         ->setTitle(pht('Log out of Phabricator?'))
         ->appendChild(pht('Are you sure you want to log out?'))
         ->addSubmitButton(pht('Logout'))
         ->addCancelButton('/');
-
-      return id(new AphrontDialogResponse())->setDialog($dialog);
     }
 
     return id(new AphrontRedirectResponse())->setURI('/');

src/applications/auth/controller/PhabricatorMustVerifyEmailController.php

@@ -53,14 +53,15 @@ final class PhabricatorMustVerifyEmailController
       ->appendParagraph($send_again)
       ->addSubmitButton(pht('Send Another Email'));
 
-    return $this->buildApplicationPage(
+    $view = array(
-      array(
+      $sent,
-        $sent,
+      $dialog,
-        $dialog,
+    );
-      ),
+
-      array(
+    return $this->newPage()
-        'title' => pht('Must Verify Email'),
+      ->setTitle(pht('Must Verify Email'))
-      ));
+      ->appendChild($view);
+
   }
 
 }

src/applications/auth/controller/config/PhabricatorAuthEditController.php

@@ -176,15 +176,33 @@ final class PhabricatorAuthEditController
         $button = pht('Add Provider');
       }
       $crumb = pht('Add Provider');
-      $title = pht('Add Authentication Provider');
+      $title = pht('Add Auth Provider');
+      $header_icon = 'fa-plus-square';
       $cancel_uri = $this->getApplicationURI('/config/new/');
     } else {
       $button = pht('Save');
       $crumb = pht('Edit Provider');
-      $title = pht('Edit Authentication Provider');
+      $title = pht('Edit Auth Provider');
+      $header_icon = 'fa-pencil';
       $cancel_uri = $this->getApplicationURI();
     }
 
+    $header = id(new PHUIHeaderView())
+      ->setHeader(pht('%s: %s', $title, $provider->getProviderName()))
+      ->setHeaderIcon($header_icon);
+
+    if ($config->getIsEnabled()) {
+      $status_name = pht('Enabled');
+      $status_color = 'green';
+      $status_icon = 'fa-check';
+      $header->setStatus($status_icon, $status_color, $status_name);
+    } else if (!$is_new) {
+      $status_name = pht('Disabled');
+      $status_color = 'indigo';
+      $status_icon = 'fa-ban';
+      $header->setStatus($status_icon, $status_color, $status_name);
+    }
+
     $config_name = 'auth.email-domains';
     $config_href = '/config/edit/'.$config_name.'/';
 
@@ -253,32 +271,8 @@ final class PhabricatorAuthEditController
         'Phabricator will automatically login with this provider if it is '.
         'the only available provider.'));
 
-    $status_tag = id(new PHUITagView())
-      ->setType(PHUITagView::TYPE_STATE);
-    if ($is_new) {
-      $status_tag
-        ->setName(pht('New Provider'))
-        ->setBackgroundColor('blue');
-    } else if ($config->getIsEnabled()) {
-      $status_tag
-        ->setName(pht('Enabled'))
-        ->setBackgroundColor('green');
-    } else {
-      $status_tag
-        ->setName(pht('Disabled'))
-        ->setBackgroundColor('red');
-    }
-
     $form = id(new AphrontFormView())
       ->setUser($viewer)
-      ->appendChild(
-        id(new AphrontFormStaticControl())
-          ->setLabel(pht('Provider'))
-          ->setValue($provider->getProviderName()))
-      ->appendChild(
-        id(new AphrontFormStaticControl())
-          ->setLabel(pht('Status'))
-          ->setValue($status_tag))
       ->appendChild(
         id(new AphrontFormCheckboxControl())
           ->setLabel(pht('Allow'))
@@ -348,6 +342,7 @@ final class PhabricatorAuthEditController
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb($crumb);
+    $crumbs->setBorder(true);
 
     $timeline = null;
     if (!$is_new) {
@@ -358,23 +353,28 @@ final class PhabricatorAuthEditController
       foreach ($xactions as $xaction) {
         $xaction->setProvider($provider);
       }
+      $timeline->setShouldTerminate(true);
     }
 
     $form_box = id(new PHUIObjectBoxView())
-      ->setHeaderText($title)
+      ->setHeaderText(pht('Provider'))
       ->setFormErrors($errors)
+      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
       ->setForm($form);
 
-    return $this->buildApplicationPage(
+    $view = id(new PHUITwoColumnView())
-      array(
+      ->setHeader($header)
-        $crumbs,
+      ->setFooter(array(
         $form_box,
         $footer,
         $timeline,
-      ),
-      array(
-        'title' => $title,
       ));
+
+    return $this->newPage()
+      ->setTitle($title)
+      ->setCrumbs($crumbs)
+      ->appendChild($view);
+
   }
 
 }

src/applications/auth/controller/config/PhabricatorAuthListController.php

@@ -3,9 +3,8 @@
 final class PhabricatorAuthListController
   extends PhabricatorAuthProviderConfigController {
 
-  public function processRequest() {
+  public function handleRequest(AphrontRequest $request) {
-    $request = $this->getRequest();
+    $viewer = $this->getViewer();
-    $viewer = $request->getUser();
 
     $configs = id(new PhabricatorAuthProviderConfigQuery())
       ->setViewer($viewer)
@@ -93,6 +92,7 @@ final class PhabricatorAuthListController
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb(pht('Auth Providers'));
+    $crumbs->setBorder(true);
 
     $domains_key = 'auth.email-domains';
     $domains_link = $this->renderConfigLink($domains_key);
@@ -155,24 +155,29 @@ final class PhabricatorAuthListController
         ->setDisabled(!$can_manage)
         ->setText(pht('Add Provider'));
 
-    $header = id(new PHUIHeaderView())
-      ->setHeader(pht('Authentication Providers'))
-      ->addActionLink($button);
-
     $list->setFlush(true);
     $list = id(new PHUIObjectBoxView())
-      ->setHeader($header)
+      ->setHeaderText(pht('Providers'))
-      ->setInfoView($warning)
+      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
       ->appendChild($list);
 
-    return $this->buildApplicationPage(
+    $title = pht('Auth Providers');
-      array(
+    $header = id(new PHUIHeaderView())
-        $crumbs,
+      ->setHeader($title)
+      ->setHeaderIcon('fa-key')
+      ->addActionLink($button);
+
+    $view = id(new PHUITwoColumnView())
+      ->setHeader($header)
+      ->setFooter(array(
+        $warning,
         $list,
-      ),
-      array(
-        'title' => pht('Authentication Providers'),
       ));
+
+    return $this->newPage()
+      ->setTitle($title)
+      ->setCrumbs($crumbs)
+      ->appendChild($view);
   }
 
   private function renderConfigLink($key) {

src/applications/auth/controller/config/PhabricatorAuthNewController.php

@@ -80,21 +80,32 @@ final class PhabricatorAuthNewController
           ->setValue(pht('Continue')));
 
     $form_box = id(new PHUIObjectBoxView())
-      ->setHeaderText(pht('Add Authentication Provider'))
+      ->setHeaderText(pht('Provider'))
       ->setFormErrors($errors)
+      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
       ->setForm($form);
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb(pht('Add Provider'));
+    $crumbs->setBorder(true);
 
-    return $this->buildApplicationPage(
+    $title = pht('Add Auth Provider');
-      array(
+
-        $crumbs,
+    $header = id(new PHUIHeaderView())
+      ->setHeader($title)
+      ->setHeaderIcon('fa-plus-square');
+
+    $view = id(new PHUITwoColumnView())
+      ->setHeader($header)
+      ->setFooter(array(
         $form_box,
-      ),
-      array(
-        'title' => pht('Add Authentication Provider'),
       ));
+
+    return $this->newPage()
+      ->setTitle($title)
+      ->setCrumbs($crumbs)
+      ->appendChild($view);
+
   }
 
 }

src/applications/auth/engine/PhabricatorAuthSessionEngine.php

@@ -39,17 +39,6 @@ final class PhabricatorAuthSessionEngine extends Phobject {
   const KIND_UNKNOWN   = '?';
 
 
-  /**
-   * Temporary tokens for one time logins.
-   */
-  const ONETIME_TEMPORARY_TOKEN_TYPE = 'login:onetime';
-
-
-  /**
-   * Temporary tokens for password recovery after one time login.
-   */
-  const PASSWORD_TEMPORARY_TOKEN_TYPE = 'login:password';
-
   const ONETIME_RECOVER = 'recover';
   const ONETIME_RESET = 'reset';
   const ONETIME_WELCOME = 'welcome';
@@ -308,6 +297,24 @@ final class PhabricatorAuthSessionEngine extends Phobject {
     }
   }
 
+  public function logoutSession(
+    PhabricatorUser $user,
+    PhabricatorAuthSession $session) {
+
+    $log = PhabricatorUserLog::initializeNewLog(
+      $user,
+      $user->getPHID(),
+      PhabricatorUserLog::ACTION_LOGOUT);
+    $log->save();
+
+    $extensions = PhabricatorAuthSessionEngineExtension::getAllExtensions();
+    foreach ($extensions as $extension) {
+      $extension->didLogout($user, array($session));
+    }
+
+    $session->delete();
+  }
+
 
 /* -(  High Security  )------------------------------------------------------ */
 
@@ -642,11 +649,12 @@ final class PhabricatorAuthSessionEngine extends Phobject {
 
     $key = Filesystem::readRandomCharacters(32);
     $key_hash = $this->getOneTimeLoginKeyHash($user, $email, $key);
+    $onetime_type = PhabricatorAuthOneTimeLoginTemporaryTokenType::TOKENTYPE;
 
     $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
       id(new PhabricatorAuthTemporaryToken())
-        ->setObjectPHID($user->getPHID())
+        ->setTokenResource($user->getPHID())
-        ->setTokenType(self::ONETIME_TEMPORARY_TOKEN_TYPE)
+        ->setTokenType($onetime_type)
         ->setTokenExpires(time() + phutil_units('1 day in seconds'))
         ->setTokenCode($key_hash)
         ->save();
@@ -685,11 +693,12 @@ final class PhabricatorAuthSessionEngine extends Phobject {
     $key = null) {
 
     $key_hash = $this->getOneTimeLoginKeyHash($user, $email, $key);
+    $onetime_type = PhabricatorAuthOneTimeLoginTemporaryTokenType::TOKENTYPE;
 
     return id(new PhabricatorAuthTemporaryTokenQuery())
       ->setViewer($user)
-      ->withObjectPHIDs(array($user->getPHID()))
+      ->withTokenResources(array($user->getPHID()))
-      ->withTokenTypes(array(self::ONETIME_TEMPORARY_TOKEN_TYPE))
+      ->withTokenTypes(array($onetime_type))
       ->withTokenCodes(array($key_hash))
       ->withExpired(false)
       ->executeOne();

src/applications/auth/engine/PhabricatorAuthSessionEngineExtension.php

@@ -0,0 +1,23 @@
+<?php
+
+abstract class PhabricatorAuthSessionEngineExtension
+  extends Phobject {
+
+  final public function getExtensionKey() {
+    return $this->getPhobjectClassConstant('EXTENSIONKEY');
+  }
+
+  final public static function getAllExtensions() {
+    return id(new PhutilClassMapQuery())
+      ->setAncestorClass(__CLASS__)
+      ->setUniqueMethod('getExtensionKey')
+      ->execute();
+  }
+
+  abstract public function getExtensionName();
+
+  public function didLogout(PhabricatorUser $user, array $sessions) {
+    return;
+  }
+
+}

src/applications/auth/engine/PhabricatorAuthSessionEngineExtensionModule.php

@@ -0,0 +1,49 @@
+<?php
+
+final class PhabricatorAuthSessionEngineExtensionModule
+  extends PhabricatorConfigModule {
+
+  public function getModuleKey() {
+    return 'sessionengine';
+  }
+
+  public function getModuleName() {
+    return pht('Engine: Session');
+  }
+
+  public function renderModuleStatus(AphrontRequest $request) {
+    $viewer = $request->getViewer();
+
+    $extensions = PhabricatorAuthSessionEngineExtension::getAllExtensions();
+
+    $rows = array();
+    foreach ($extensions as $extension) {
+      $rows[] = array(
+        get_class($extension),
+        $extension->getExtensionKey(),
+        $extension->getExtensionName(),
+      );
+    }
+
+    $table = id(new AphrontTableView($rows))
+      ->setNoDataString(
+        pht('There are no registered session engine extensions.'))
+      ->setHeaders(
+        array(
+          pht('Class'),
+          pht('Key'),
+          pht('Name'),
+        ))
+      ->setColumnClasses(
+        array(
+          null,
+          null,
+          'wide pri',
+        ));
+
+    return id(new PHUIObjectBoxView())
+      ->setHeaderText(pht('SessionEngine Extensions'))
+      ->setTable($table);
+  }
+
+}

src/applications/auth/factor/PhabricatorAuthTOTPKeyTemporaryTokenType.php

@@ -0,0 +1,17 @@
+<?php
+
+final class PhabricatorAuthTOTPKeyTemporaryTokenType
+  extends PhabricatorAuthTemporaryTokenType {
+
+  const TOKENTYPE = 'mfa:totp:key';
+
+  public function getTokenTypeDisplayName() {
+    return pht('TOTP Synchronization');
+  }
+
+  public function getTokenReadableTypeName(
+    PhabricatorAuthTemporaryToken $token) {
+    return pht('TOTP Sync Token');
+  }
+
+}

src/applications/auth/factor/PhabricatorTOTPAuthFactor.php

@@ -2,8 +2,6 @@
 
 final class PhabricatorTOTPAuthFactor extends PhabricatorAuthFactor {
 
-  const TEMPORARY_TOKEN_TYPE = 'mfa:totp:key';
-
   public function getFactorKey() {
     return 'totp';
   }
@@ -24,6 +22,8 @@ final class PhabricatorTOTPAuthFactor extends PhabricatorAuthFactor {
     AphrontRequest $request,
     PhabricatorUser $user) {
 
+    $totp_token_type = PhabricatorAuthTOTPKeyTemporaryTokenType::TOKENTYPE;
+
     $key = $request->getStr('totpkey');
     if (strlen($key)) {
       // If the user is providing a key, make sure it's a key we generated.
@@ -36,8 +36,8 @@ final class PhabricatorTOTPAuthFactor extends PhabricatorAuthFactor {
 
       $temporary_token = id(new PhabricatorAuthTemporaryTokenQuery())
         ->setViewer($user)
-        ->withObjectPHIDs(array($user->getPHID()))
+        ->withTokenResources(array($user->getPHID()))
-        ->withTokenTypes(array(self::TEMPORARY_TOKEN_TYPE))
+        ->withTokenTypes(array($totp_token_type))
         ->withExpired(false)
         ->withTokenCodes(array(PhabricatorHash::digest($key)))
         ->executeOne();
@@ -55,8 +55,8 @@ final class PhabricatorTOTPAuthFactor extends PhabricatorAuthFactor {
 
       $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
         id(new PhabricatorAuthTemporaryToken())
-          ->setObjectPHID($user->getPHID())
+          ->setTokenResource($user->getPHID())
-          ->setTokenType(self::TEMPORARY_TOKEN_TYPE)
+          ->setTokenType($totp_token_type)
           ->setTokenExpires(time() + phutil_units('1 hour in seconds'))
           ->setTokenCode(PhabricatorHash::digest($key))
           ->save();

src/applications/auth/provider/PhabricatorOAuth1AuthProvider.php

@@ -9,8 +9,6 @@ abstract class PhabricatorOAuth1AuthProvider
   const PROPERTY_CONSUMER_SECRET = 'oauth1:consumer:secret';
   const PROPERTY_PRIVATE_KEY = 'oauth1:private:key';
 
-  const TEMPORARY_TOKEN_TYPE = 'oauth1:request:secret';
-
   protected function getIDKey() {
     return self::PROPERTY_CONSUMER_KEY;
   }
@@ -215,13 +213,14 @@ abstract class PhabricatorOAuth1AuthProvider
 
 
   private function saveHandshakeTokenSecret($client_code, $secret) {
+    $secret_type = PhabricatorOAuth1SecretTemporaryTokenType::TOKENTYPE;
     $key = $this->getHandshakeTokenKeyFromClientCode($client_code);
-    $type = $this->getTemporaryTokenType(self::TEMPORARY_TOKEN_TYPE);
+    $type = $this->getTemporaryTokenType($secret_type);
 
     // Wipe out an existing token, if one exists.
     $token = id(new PhabricatorAuthTemporaryTokenQuery())
       ->setViewer(PhabricatorUser::getOmnipotentUser())
-      ->withObjectPHIDs(array($key))
+      ->withTokenResources(array($key))
       ->withTokenTypes(array($type))
       ->executeOne();
     if ($token) {
@@ -230,7 +229,7 @@ abstract class PhabricatorOAuth1AuthProvider
 
     // Save the new secret.
     id(new PhabricatorAuthTemporaryToken())
-      ->setObjectPHID($key)
+      ->setTokenResource($key)
       ->setTokenType($type)
       ->setTokenExpires(time() + phutil_units('1 hour in seconds'))
       ->setTokenCode($secret)
@@ -238,12 +237,13 @@ abstract class PhabricatorOAuth1AuthProvider
   }
 
   private function loadHandshakeTokenSecret($client_code) {
+    $secret_type = PhabricatorOAuth1SecretTemporaryTokenType::TOKENTYPE;
     $key = $this->getHandshakeTokenKeyFromClientCode($client_code);
-    $type = $this->getTemporaryTokenType(self::TEMPORARY_TOKEN_TYPE);
+    $type = $this->getTemporaryTokenType($secret_type);
 
     $token = id(new PhabricatorAuthTemporaryTokenQuery())
       ->setViewer(PhabricatorUser::getOmnipotentUser())
-      ->withObjectPHIDs(array($key))
+      ->withTokenResources(array($key))
       ->withTokenTypes(array($type))
       ->withExpired(false)
       ->executeOne();
@@ -263,6 +263,9 @@ abstract class PhabricatorOAuth1AuthProvider
     // others' toes if a user starts Mediawiki and Bitbucket auth at the
     // same time.
 
+    // TODO: This isn't really a proper use of the table and should get
+    // cleaned up some day: the type should be constant.
+
     return $core_type.':'.$this->getProviderConfig()->getID();
   }
 

src/applications/auth/provider/PhabricatorOAuth1SecretTemporaryTokenType.php

@@ -0,0 +1,17 @@
+<?php
+
+final class PhabricatorOAuth1SecretTemporaryTokenType
+  extends PhabricatorAuthTemporaryTokenType {
+
+  const TOKENTYPE = 'oauth1:request:secret';
+
+  public function getTokenTypeDisplayName() {
+    return pht('OAuth1 Handshake Secret');
+  }
+
+  public function getTokenReadableTypeName(
+    PhabricatorAuthTemporaryToken $token) {
+    return pht('OAuth1 Handshake Token');
+  }
+
+}

src/applications/auth/provider/PhabricatorPhabricatorAuthProvider.php

@@ -201,4 +201,9 @@ final class PhabricatorPhabricatorAuthProvider
     return true;
   }
 
+  public function getPhabricatorURI() {
+    $config = $this->getProviderConfig();
+    return $config->getProperty(self::PROPERTY_PHABRICATOR_URI);
+  }
+
 }