(stable) Promote 2016 Week 5

resources/celerity/map.php

@@ -7,11 +7,11 @@
  */
 return array(
   'names' => array(
-    'core.pkg.css' => '1d1e9a3a',
+    'core.pkg.css' => '5e4df064',
-    'core.pkg.js' => '573e6664',
+    'core.pkg.js' => 'a79eed25',
     'darkconsole.pkg.js' => 'e7393ebb',
     'differential.pkg.css' => '2de124c9',
-    'differential.pkg.js' => 'f83532f8',
+    'differential.pkg.js' => '5c2ba922',
     'diffusion.pkg.css' => 'f45955ed',
     'diffusion.pkg.js' => '3a9a8bfa',
     'maniphest.pkg.css' => '4845691a',
@@ -35,7 +35,7 @@ return array(
     'rsrc/css/application/base/main-menu-view.css' => 'd00a795a',
     'rsrc/css/application/base/notification-menu.css' => 'f31c0bde',
     'rsrc/css/application/base/phabricator-application-launch-view.css' => '95351601',
-    'rsrc/css/application/base/phui-theme.css' => '981a58f8',
+    'rsrc/css/application/base/phui-theme.css' => 'ab7b848c',
     'rsrc/css/application/base/standard-page-view.css' => '7b0d68d8',
     'rsrc/css/application/chatlog/chatlog.css' => 'd295b020',
     'rsrc/css/application/conduit/conduit-api.css' => '7bc725c4',
@@ -74,13 +74,13 @@ return array(
     'rsrc/css/application/herald/herald-test.css' => 'a52e323e',
     'rsrc/css/application/herald/herald.css' => '826075fa',
     'rsrc/css/application/maniphest/batch-editor.css' => 'b0f0b6d5',
-    'rsrc/css/application/maniphest/report.css' => 'f6931fdf',
+    'rsrc/css/application/maniphest/report.css' => '9b9580b7',
     'rsrc/css/application/maniphest/task-edit.css' => 'fda62a9b',
     'rsrc/css/application/maniphest/task-summary.css' => '11cc5344',
     'rsrc/css/application/objectselector/object-selector.css' => '85ee8ce6',
     'rsrc/css/application/owners/owners-path-editor.css' => '2f00933b',
     'rsrc/css/application/paste/paste.css' => 'a5157c48',
-    'rsrc/css/application/people/people-profile.css' => 'fa2069ec',
+    'rsrc/css/application/people/people-profile.css' => '2473d929',
     'rsrc/css/application/phame/phame.css' => '6d5b3682',
     'rsrc/css/application/pholio/pholio-edit.css' => '3ad9d1ee',
     'rsrc/css/application/pholio/pholio-inline-comments.css' => '8e545e49',
@@ -93,6 +93,7 @@ return array(
     'rsrc/css/application/policy/policy-transaction-detail.css' => '82100a43',
     'rsrc/css/application/policy/policy.css' => '957ea14c',
     'rsrc/css/application/ponder/ponder-view.css' => '7b0df4da',
+    'rsrc/css/application/project/project-view.css' => '22f7ed0e',
     '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',
@@ -101,8 +102,8 @@ return array(
     'rsrc/css/application/slowvote/slowvote.css' => 'da0afb1b',
     'rsrc/css/application/tokens/tokens.css' => '3d0f239e',
     'rsrc/css/application/uiexample/example.css' => '528b19de',
-    'rsrc/css/core/core.css' => 'a76cefc9',
+    'rsrc/css/core/core.css' => '5b3563c8',
-    'rsrc/css/core/remarkup.css' => '64277c02',
+    'rsrc/css/core/remarkup.css' => 'e1c8b32f',
     'rsrc/css/core/syntax.css' => '9fd11da8',
     'rsrc/css/core/z-index.css' => 'a36a45da',
     'rsrc/css/diviner/diviner-shared.css' => 'aa3656aa',
@@ -122,17 +123,17 @@ 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' => '10939564',
+    'rsrc/css/phui/phui-box.css' => '6e8ac7fd',
-    'rsrc/css/phui/phui-button.css' => '16020a60',
+    'rsrc/css/phui/phui-button.css' => 'd6ac72db',
     'rsrc/css/phui/phui-crumbs-view.css' => '414406b5',
     'rsrc/css/phui/phui-document-pro.css' => '8799acf7',
     'rsrc/css/phui/phui-document-summary.css' => '9ca48bdf',
-    'rsrc/css/phui/phui-document.css' => 'a4a1c3b9',
+    'rsrc/css/phui/phui-document.css' => '9c71d2bf',
     'rsrc/css/phui/phui-feed-story.css' => 'b7b26d23',
     'rsrc/css/phui/phui-fontkit.css' => '9cda225e',
     'rsrc/css/phui/phui-form-view.css' => '4a1a0f5e',
     'rsrc/css/phui/phui-form.css' => '0b98e572',
-    'rsrc/css/phui/phui-header-view.css' => '55bb32dd',
+    'rsrc/css/phui/phui-header-view.css' => 'd53cc835',
     'rsrc/css/phui/phui-icon-set-selector.css' => '1ab67aad',
     'rsrc/css/phui/phui-icon.css' => '3f33ab57',
     'rsrc/css/phui/phui-image-mask.css' => '5a8b09c8',
@@ -140,20 +141,20 @@ return array(
     'rsrc/css/phui/phui-info-view.css' => '6d7c3509',
     'rsrc/css/phui/phui-list.css' => '9da2aa00',
     'rsrc/css/phui/phui-object-box.css' => '407eaf5a',
-    'rsrc/css/phui/phui-object-item-list-view.css' => '26c30d3f',
+    'rsrc/css/phui/phui-object-item-list-view.css' => '0d484a97',
     'rsrc/css/phui/phui-pager.css' => 'bea33d23',
     'rsrc/css/phui/phui-pinboard-view.css' => '2495140e',
-    'rsrc/css/phui/phui-profile-menu.css' => '43826c43',
+    'rsrc/css/phui/phui-profile-menu.css' => 'ab4fcf5f',
     'rsrc/css/phui/phui-property-list-view.css' => '27b2849e',
     'rsrc/css/phui/phui-remarkup-preview.css' => '1a8f2591',
     'rsrc/css/phui/phui-spacing.css' => '042804d6',
     'rsrc/css/phui/phui-status.css' => '888cedb8',
     'rsrc/css/phui/phui-tag-view.css' => 'e60e227b',
-    'rsrc/css/phui/phui-text.css' => 'cf019f54',
     'rsrc/css/phui/phui-timeline-view.css' => '2efceff8',
-    'rsrc/css/phui/phui-two-column-view.css' => '39ecafb1',
+    'rsrc/css/phui/phui-two-column-view.css' => 'c75bfc5b',
-    'rsrc/css/phui/phui-workboard-view.css' => 'f488d036',
+    'rsrc/css/phui/workboards/phui-workboard.css' => 'b07a5524',
-    'rsrc/css/phui/phui-workpanel-view.css' => 'adec7699',
+    'rsrc/css/phui/workboards/phui-workcard.css' => 'ffb55371',
+    'rsrc/css/phui/workboards/phui-workpanel.css' => 'e9339dc3',
     'rsrc/css/sprite-login.css' => '60e8560e',
     'rsrc/css/sprite-menu.css' => '9dd65b92',
     'rsrc/css/sprite-tokens.css' => '4f399012',
@@ -191,8 +192,8 @@ return array(
     'rsrc/externals/font/lato/lato-regular.ttf' => 'e270165b',
     'rsrc/externals/font/lato/lato-regular.woff' => '13d39fe2',
     'rsrc/externals/font/lato/lato-regular.woff2' => '57a9f742',
-    'rsrc/externals/javelin/core/Event.js' => '85ea0626',
+    'rsrc/externals/javelin/core/Event.js' => '2ee659ce',
-    'rsrc/externals/javelin/core/Stratcom.js' => '6c53634d',
+    'rsrc/externals/javelin/core/Stratcom.js' => '6ad39b6f',
     'rsrc/externals/javelin/core/__tests__/event-stop-and-kill.js' => '717554e4',
     'rsrc/externals/javelin/core/__tests__/install.js' => 'c432ee85',
     'rsrc/externals/javelin/core/__tests__/stratcom.js' => '88bf7313',
@@ -378,7 +379,7 @@ return array(
     'rsrc/js/application/differential/behavior-comment-preview.js' => 'b064af76',
     'rsrc/js/application/differential/behavior-diff-radios.js' => 'e1ff79b1',
     'rsrc/js/application/differential/behavior-dropdown-menus.js' => '9a6b9324',
-    'rsrc/js/application/differential/behavior-edit-inline-comments.js' => '65ef6074',
+    'rsrc/js/application/differential/behavior-edit-inline-comments.js' => '4fbbc3e9',
     'rsrc/js/application/differential/behavior-keyboard-nav.js' => '2c426492',
     'rsrc/js/application/differential/behavior-populate.js' => '8694b1df',
     'rsrc/js/application/differential/behavior-toggle-files.js' => 'ca3f91eb',
@@ -464,7 +465,7 @@ return array(
     'rsrc/js/core/behavior-choose-control.js' => '327a00d1',
     'rsrc/js/core/behavior-crop.js' => 'fa0f4fc2',
     'rsrc/js/core/behavior-dark-console.js' => 'f411b6ae',
-    'rsrc/js/core/behavior-device.js' => 'a205cf28',
+    'rsrc/js/core/behavior-device.js' => 'b5b36110',
     'rsrc/js/core/behavior-drag-and-drop-textarea.js' => '4f6a4b4e',
     'rsrc/js/core/behavior-error-log.js' => '6882e80a',
     'rsrc/js/core/behavior-fancy-datepicker.js' => '8ae55229',
@@ -500,10 +501,10 @@ return array(
     'rsrc/js/core/phtize.js' => 'd254d646',
     'rsrc/js/phui/behavior-phui-dropdown-menu.js' => '54733475',
     'rsrc/js/phui/behavior-phui-object-box-tabs.js' => '2bfa2836',
-    'rsrc/js/phui/behavior-phui-profile-menu.js' => 'bfc2e675',
+    'rsrc/js/phui/behavior-phui-profile-menu.js' => '12884df9',
     'rsrc/js/phuix/PHUIXActionListView.js' => 'b5c256b8',
     'rsrc/js/phuix/PHUIXActionView.js' => '8cf6d262',
-    'rsrc/js/phuix/PHUIXAutocomplete.js' => '21dc9144',
+    'rsrc/js/phuix/PHUIXAutocomplete.js' => '9196fb06',
     'rsrc/js/phuix/PHUIXDropdownMenu.js' => 'bd4c8dca',
     'rsrc/js/phuix/PHUIXFormControl.js' => '8fba1997',
     'rsrc/js/phuix/PHUIXIconView.js' => 'bff6884b',
@@ -583,12 +584,12 @@ return array(
     'javelin-behavior-dashboard-tab-panel' => 'd4eecc63',
     'javelin-behavior-day-view' => '5c46cff2',
     'javelin-behavior-desktop-notifications-control' => 'edd1ba66',
-    'javelin-behavior-device' => 'a205cf28',
+    'javelin-behavior-device' => 'b5b36110',
     'javelin-behavior-differential-add-reviewers-and-ccs' => 'e10f8e18',
     'javelin-behavior-differential-comment-jump' => '4fdb476d',
     'javelin-behavior-differential-diff-radios' => 'e1ff79b1',
     'javelin-behavior-differential-dropdown-menus' => '9a6b9324',
-    'javelin-behavior-differential-edit-inline-comments' => '65ef6074',
+    'javelin-behavior-differential-edit-inline-comments' => '4fbbc3e9',
     'javelin-behavior-differential-feedback-preview' => 'b064af76',
     'javelin-behavior-differential-keyboard-navigation' => '2c426492',
     'javelin-behavior-differential-populate' => '8694b1df',
@@ -649,7 +650,7 @@ return array(
     'javelin-behavior-pholio-mock-view' => 'fbe497e7',
     'javelin-behavior-phui-dropdown-menu' => '54733475',
     'javelin-behavior-phui-object-box-tabs' => '2bfa2836',
-    'javelin-behavior-phui-profile-menu' => 'bfc2e675',
+    'javelin-behavior-phui-profile-menu' => '12884df9',
     'javelin-behavior-policy-control' => 'ae45872f',
     'javelin-behavior-policy-rule-editor' => '5e9f347c',
     'javelin-behavior-project-boards' => 'ba4fa35c',
@@ -682,7 +683,7 @@ return array(
     'javelin-diffusion-locate-file-source' => 'b42eddc7',
     'javelin-dom' => '805b806a',
     'javelin-dynval' => 'f6555212',
-    'javelin-event' => '85ea0626',
+    'javelin-event' => '2ee659ce',
     'javelin-fx' => '54b612ba',
     'javelin-history' => 'd4505101',
     'javelin-install' => '05270951',
@@ -701,7 +702,7 @@ return array(
     'javelin-router' => '29274e2b',
     'javelin-scrollbar' => '087e919c',
     'javelin-sound' => '949c0fe5',
-    'javelin-stratcom' => '6c53634d',
+    'javelin-stratcom' => '6ad39b6f',
     'javelin-tokenizer' => '8d3bc1b2',
     'javelin-typeahead' => '70baed2f',
     'javelin-typeahead-composite-source' => '503e17fd',
@@ -722,7 +723,7 @@ return array(
     'javelin-workflow' => '5b2e3e2b',
     'lightbox-attachment-css' => '7acac05d',
     'maniphest-batch-editor' => 'b0f0b6d5',
-    'maniphest-report-css' => 'f6931fdf',
+    'maniphest-report-css' => '9b9580b7',
     'maniphest-task-edit-css' => 'fda62a9b',
     'maniphest-task-summary-css' => '11cc5344',
     'multirow-row-manager' => 'b5d57730',
@@ -730,13 +731,13 @@ return array(
     'owners-path-editor-css' => '2f00933b',
     'paste-css' => 'a5157c48',
     'path-typeahead' => 'f7fc67ec',
-    'people-profile-css' => 'fa2069ec',
+    'people-profile-css' => '2473d929',
     'phabricator-action-list-view-css' => 'c5eba19d',
     'phabricator-application-launch-view-css' => '95351601',
     'phabricator-busy' => '59a7976a',
     'phabricator-chatlog-css' => 'd295b020',
     'phabricator-content-source-view-css' => '4b8b05d4',
-    'phabricator-core-css' => 'a76cefc9',
+    'phabricator-core-css' => '5b3563c8',
     'phabricator-countdown-css' => 'e7544472',
     'phabricator-dashboard-css' => 'eb458607',
     'phabricator-drag-and-drop-file-upload' => 'ad10aeac',
@@ -758,7 +759,7 @@ return array(
     'phabricator-object-selector-css' => '85ee8ce6',
     'phabricator-phtize' => 'd254d646',
     'phabricator-prefab' => 'e67df814',
-    'phabricator-remarkup-css' => '64277c02',
+    'phabricator-remarkup-css' => 'e1c8b32f',
     'phabricator-search-results-css' => '7dea472c',
     'phabricator-shaped-request' => '7cbe244b',
     'phabricator-side-menu-view-css' => '3a3d9f41',
@@ -792,22 +793,22 @@ return array(
     'phui-action-panel-css' => '91c7b835',
     'phui-badge-view-css' => 'f25c3476',
     'phui-big-info-view-css' => 'bd903741',
-    'phui-box-css' => '10939564',
+    'phui-box-css' => '6e8ac7fd',
-    'phui-button-css' => '16020a60',
+    'phui-button-css' => 'd6ac72db',
     'phui-calendar-css' => 'ccabe893',
     'phui-calendar-day-css' => 'd1cf6f93',
     'phui-calendar-list-css' => 'c1c7f338',
     'phui-calendar-month-css' => '476be7e0',
     'phui-crumbs-view-css' => '414406b5',
     'phui-document-summary-view-css' => '9ca48bdf',
-    'phui-document-view-css' => 'a4a1c3b9',
+    'phui-document-view-css' => '9c71d2bf',
     'phui-document-view-pro-css' => '8799acf7',
     'phui-feed-story-css' => 'b7b26d23',
     'phui-font-icon-base-css' => 'ecbbb4c2',
     'phui-fontkit-css' => '9cda225e',
     'phui-form-css' => '0b98e572',
     'phui-form-view-css' => '4a1a0f5e',
-    'phui-header-view-css' => '55bb32dd',
+    'phui-header-view-css' => 'd53cc835',
     'phui-icon-set-selector-css' => '1ab67aad',
     'phui-icon-view-css' => '3f33ab57',
     'phui-image-mask-css' => '5a8b09c8',
@@ -816,24 +817,24 @@ return array(
     'phui-inline-comment-view-css' => '0fdb3667',
     'phui-list-view-css' => '9da2aa00',
     'phui-object-box-css' => '407eaf5a',
-    'phui-object-item-list-view-css' => '26c30d3f',
+    'phui-object-item-list-view-css' => '0d484a97',
     'phui-pager-css' => 'bea33d23',
     'phui-pinboard-view-css' => '2495140e',
-    'phui-profile-menu-css' => '43826c43',
+    'phui-profile-menu-css' => 'ab4fcf5f',
     'phui-property-list-view-css' => '27b2849e',
     'phui-remarkup-preview-css' => '1a8f2591',
     'phui-spacing-css' => '042804d6',
     'phui-status-list-view-css' => '888cedb8',
     'phui-tag-view-css' => 'e60e227b',
-    'phui-text-css' => 'cf019f54',
+    'phui-theme-css' => 'ab7b848c',
-    'phui-theme-css' => '981a58f8',
     'phui-timeline-view-css' => '2efceff8',
-    'phui-two-column-view-css' => '39ecafb1',
+    'phui-two-column-view-css' => 'c75bfc5b',
-    'phui-workboard-view-css' => 'f488d036',
+    'phui-workboard-view-css' => 'b07a5524',
-    'phui-workpanel-view-css' => 'adec7699',
+    'phui-workcard-view-css' => 'ffb55371',
+    'phui-workpanel-view-css' => 'e9339dc3',
     'phuix-action-list-view' => 'b5c256b8',
     'phuix-action-view' => '8cf6d262',
-    'phuix-autocomplete' => '21dc9144',
+    'phuix-autocomplete' => '9196fb06',
     'phuix-dropdown-menu' => 'bd4c8dca',
     'phuix-form-control-view' => '8fba1997',
     'phuix-icon-view' => 'bff6884b',
@@ -841,6 +842,7 @@ return array(
     'policy-edit-css' => '815c66f7',
     'policy-transaction-detail-css' => '82100a43',
     'ponder-view-css' => '7b0df4da',
+    'project-view-css' => '22f7ed0e',
     'raphael-core' => '51ee6b43',
     'raphael-g' => '40dde778',
     'raphael-g-line' => '40da039e',
@@ -926,6 +928,11 @@ return array(
       'javelin-install',
       'javelin-util',
     ),
+    '12884df9' => array(
+      'javelin-behavior',
+      'javelin-stratcom',
+      'javelin-dom',
+    ),
     '13c739ea' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -999,12 +1006,6 @@ return array(
       'javelin-stratcom',
       'conpherence-thread-manager',
     ),
-    '21dc9144' => array(
-      'javelin-install',
-      'javelin-dom',
-      'phuix-icon-view',
-      'phabricator-prefab',
-    ),
     '2290aeef' => array(
       'javelin-install',
       'javelin-dom',
@@ -1049,6 +1050,9 @@ return array(
       'javelin-install',
       'javelin-event',
     ),
+    '2ee659ce' => array(
+      'javelin-install',
+    ),
     '327a00d1' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -1163,6 +1167,14 @@ return array(
       'phabricator-drag-and-drop-file-upload',
       'phabricator-textareautils',
     ),
+    '4fbbc3e9' => array(
+      'javelin-behavior',
+      'javelin-stratcom',
+      'javelin-dom',
+      'javelin-util',
+      'javelin-vector',
+      'differential-inline-comment-editor',
+    ),
     '4fdb476d' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -1294,14 +1306,6 @@ return array(
       'javelin-request',
       'javelin-workflow',
     ),
-    '65ef6074' => array(
-      'javelin-behavior',
-      'javelin-stratcom',
-      'javelin-dom',
-      'javelin-util',
-      'javelin-vector',
-      'differential-inline-comment-editor',
-    ),
     '66dd6e9e' => array(
       'javelin-behavior',
       'javelin-behavior-device',
@@ -1315,6 +1319,12 @@ return array(
     '69adf288' => array(
       'javelin-install',
     ),
+    '6ad39b6f' => array(
+      'javelin-install',
+      'javelin-event',
+      'javelin-util',
+      'javelin-magical-init',
+    ),
     '6b8ef10b' => array(
       'javelin-install',
     ),
@@ -1326,12 +1336,6 @@ return array(
       'javelin-install',
       'javelin-util',
     ),
-    '6c53634d' => array(
-      'javelin-install',
-      'javelin-event',
-      'javelin-util',
-      'javelin-magical-init',
-    ),
     '6d3e1947' => array(
       'javelin-behavior',
       'javelin-diffusion-locate-file-source',
@@ -1445,9 +1449,6 @@ return array(
       'javelin-dom',
       'javelin-stratcom',
     ),
-    '85ea0626' => array(
-      'javelin-install',
-    ),
     '85ee8ce6' => array(
       'aphront-dialog-view-css',
     ),
@@ -1520,6 +1521,12 @@ return array(
       'javelin-dom',
       'javelin-request',
     ),
+    '9196fb06' => array(
+      'javelin-install',
+      'javelin-dom',
+      'phuix-icon-view',
+      'phabricator-prefab',
+    ),
     '93d0c9e3' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -1595,13 +1602,6 @@ return array(
       'javelin-vector',
       'javelin-magical-init',
     ),
-    'a205cf28' => array(
-      'javelin-behavior',
-      'javelin-stratcom',
-      'javelin-dom',
-      'javelin-vector',
-      'javelin-install',
-    ),
     'a2828756' => array(
       'javelin-dom',
       'javelin-util',
@@ -1732,6 +1732,13 @@ return array(
       'javelin-dom',
       'phabricator-draggable-list',
     ),
+    'b5b36110' => array(
+      'javelin-behavior',
+      'javelin-stratcom',
+      'javelin-dom',
+      'javelin-vector',
+      'javelin-install',
+    ),
     'b5c256b8' => array(
       'javelin-install',
       'javelin-dom',
@@ -1774,11 +1781,6 @@ return array(
       'javelin-util',
       'javelin-request',
     ),
-    'bfc2e675' => array(
-      'javelin-behavior',
-      'javelin-stratcom',
-      'javelin-dom',
-    ),
     'bff6884b' => array(
       'javelin-install',
       'javelin-dom',
@@ -1980,6 +1982,9 @@ return array(
     'e6e25838' => array(
       'javelin-install',
     ),
+    'e9339dc3' => array(
+      'phui-workcard-view-css',
+    ),
     'e9581f08' => array(
       'javelin-behavior',
       'javelin-stratcom',

resources/sql/autopatches/20160124.people.1.icon.sql

@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_user.user_profile
+  ADD icon VARCHAR(32) NOT NULL COLLATE {$COLLATE_TEXT};

resources/sql/autopatches/20160124.people.2.icondefault.sql

@@ -0,0 +1,2 @@
+UPDATE {$NAMESPACE}_user.user_profile
+  SET icon = 'person' WHERE icon = '';

resources/sql/autopatches/20160128.repo.1.pull.sql

@@ -0,0 +1,14 @@
+CREATE TABLE {$NAMESPACE}_repository.repository_pullevent (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  phid VARBINARY(64) NOT NULL,
+  repositoryPHID VARBINARY(64),
+  epoch INT UNSIGNED NOT NULL,
+  pullerPHID VARBINARY(64),
+  remoteAddress INT UNSIGNED,
+  remoteProtocol VARCHAR(32) COLLATE {$COLLATE_TEXT},
+  resultType VARCHAR(32) NOT NULL COLLATE {$COLLATE_TEXT},
+  resultCode INT UNSIGNED NOT NULL,
+  properties LONGTEXT NOT NULL COLLATE {$COLLATE_TEXT},
+  KEY `key_repository` (repositoryPHID),
+  KEY `key_epoch` (epoch)
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};

src/__phutil_library_map__.php

@@ -688,6 +688,7 @@ phutil_register_library_map(array(
     'DiffusionPreCommitRefRepositoryHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitRefRepositoryHeraldField.php',
     'DiffusionPreCommitRefRepositoryProjectsHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitRefRepositoryProjectsHeraldField.php',
     'DiffusionPreCommitRefTypeHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitRefTypeHeraldField.php',
+    'DiffusionPullEventGarbageCollector' => 'applications/diffusion/DiffusionPullEventGarbageCollector.php',
     'DiffusionPushCapability' => 'applications/diffusion/capability/DiffusionPushCapability.php',
     'DiffusionPushEventViewController' => 'applications/diffusion/controller/DiffusionPushEventViewController.php',
     'DiffusionPushLogController' => 'applications/diffusion/controller/DiffusionPushLogController.php',
@@ -1524,8 +1525,6 @@ phutil_register_library_map(array(
     'PHUIStatusListView' => 'view/phui/PHUIStatusListView.php',
     'PHUITagExample' => 'applications/uiexample/examples/PHUITagExample.php',
     'PHUITagView' => 'view/phui/PHUITagView.php',
-    'PHUITextExample' => 'applications/uiexample/examples/PHUITextExample.php',
-    'PHUITextView' => 'view/phui/PHUITextView.php',
     'PHUITimelineEventView' => 'view/phui/PHUITimelineEventView.php',
     'PHUITimelineExample' => 'applications/uiexample/examples/PHUITimelineExample.php',
     'PHUITimelineView' => 'view/phui/PHUITimelineView.php',
@@ -2737,6 +2736,7 @@ phutil_register_library_map(array(
     'PhabricatorPeopleEmpowerController' => 'applications/people/controller/PhabricatorPeopleEmpowerController.php',
     'PhabricatorPeopleExternalPHIDType' => 'applications/people/phid/PhabricatorPeopleExternalPHIDType.php',
     'PhabricatorPeopleHovercardEngineExtension' => 'applications/people/engineextension/PhabricatorPeopleHovercardEngineExtension.php',
+    'PhabricatorPeopleIconSet' => 'applications/people/icon/PhabricatorPeopleIconSet.php',
     'PhabricatorPeopleInviteController' => 'applications/people/controller/PhabricatorPeopleInviteController.php',
     'PhabricatorPeopleInviteListController' => 'applications/people/controller/PhabricatorPeopleInviteListController.php',
     'PhabricatorPeopleInviteSendController' => 'applications/people/controller/PhabricatorPeopleInviteSendController.php',
@@ -2746,11 +2746,13 @@ phutil_register_library_map(array(
     'PhabricatorPeopleLogSearchEngine' => 'applications/people/query/PhabricatorPeopleLogSearchEngine.php',
     'PhabricatorPeopleLogsController' => 'applications/people/controller/PhabricatorPeopleLogsController.php',
     'PhabricatorPeopleMainMenuBarExtension' => 'applications/people/extension/PhabricatorPeopleMainMenuBarExtension.php',
+    'PhabricatorPeopleManageProfilePanel' => 'applications/people/profilepanel/PhabricatorPeopleManageProfilePanel.php',
     'PhabricatorPeopleNewController' => 'applications/people/controller/PhabricatorPeopleNewController.php',
     'PhabricatorPeopleNoOwnerDatasource' => 'applications/people/typeahead/PhabricatorPeopleNoOwnerDatasource.php',
     'PhabricatorPeopleOwnerDatasource' => 'applications/people/typeahead/PhabricatorPeopleOwnerDatasource.php',
     'PhabricatorPeopleProfileController' => 'applications/people/controller/PhabricatorPeopleProfileController.php',
     'PhabricatorPeopleProfileEditController' => 'applications/people/controller/PhabricatorPeopleProfileEditController.php',
+    'PhabricatorPeopleProfileManageController' => 'applications/people/controller/PhabricatorPeopleProfileManageController.php',
     'PhabricatorPeopleProfilePanelEngine' => 'applications/people/engine/PhabricatorPeopleProfilePanelEngine.php',
     'PhabricatorPeopleProfilePictureController' => 'applications/people/controller/PhabricatorPeopleProfilePictureController.php',
     'PhabricatorPeopleProfileViewController' => 'applications/people/controller/PhabricatorPeopleProfileViewController.php',
@@ -2889,7 +2891,6 @@ phutil_register_library_map(array(
     'PhabricatorProjectHeraldAction' => 'applications/project/herald/PhabricatorProjectHeraldAction.php',
     'PhabricatorProjectHeraldAdapter' => 'applications/project/herald/PhabricatorProjectHeraldAdapter.php',
     'PhabricatorProjectHeraldFieldGroup' => 'applications/project/herald/PhabricatorProjectHeraldFieldGroup.php',
-    'PhabricatorProjectHistoryController' => 'applications/project/controller/PhabricatorProjectHistoryController.php',
     'PhabricatorProjectIconSet' => 'applications/project/icon/PhabricatorProjectIconSet.php',
     'PhabricatorProjectIconsConfigOptionType' => 'applications/project/config/PhabricatorProjectIconsConfigOptionType.php',
     'PhabricatorProjectInterface' => 'applications/project/interface/PhabricatorProjectInterface.php',
@@ -2901,6 +2902,8 @@ phutil_register_library_map(array(
     'PhabricatorProjectLogicalOrNotDatasource' => 'applications/project/typeahead/PhabricatorProjectLogicalOrNotDatasource.php',
     'PhabricatorProjectLogicalUserDatasource' => 'applications/project/typeahead/PhabricatorProjectLogicalUserDatasource.php',
     'PhabricatorProjectLogicalViewerDatasource' => 'applications/project/typeahead/PhabricatorProjectLogicalViewerDatasource.php',
+    'PhabricatorProjectManageController' => 'applications/project/controller/PhabricatorProjectManageController.php',
+    'PhabricatorProjectManageProfilePanel' => 'applications/project/profilepanel/PhabricatorProjectManageProfilePanel.php',
     'PhabricatorProjectMaterializedMemberEdgeType' => 'applications/project/edge/PhabricatorProjectMaterializedMemberEdgeType.php',
     'PhabricatorProjectMemberListView' => 'applications/project/view/PhabricatorProjectMemberListView.php',
     'PhabricatorProjectMemberOfProjectEdgeType' => 'applications/project/edge/PhabricatorProjectMemberOfProjectEdgeType.php',
@@ -2950,10 +2953,12 @@ phutil_register_library_map(array(
     'PhabricatorProjectsEditEngineExtension' => 'applications/project/engineextension/PhabricatorProjectsEditEngineExtension.php',
     'PhabricatorProjectsEditField' => 'applications/transactions/editfield/PhabricatorProjectsEditField.php',
     'PhabricatorProjectsFulltextEngineExtension' => 'applications/project/engineextension/PhabricatorProjectsFulltextEngineExtension.php',
+    'PhabricatorProjectsMembersSearchEngineAttachment' => 'applications/project/engineextension/PhabricatorProjectsMembersSearchEngineAttachment.php',
     'PhabricatorProjectsMembershipIndexEngineExtension' => 'applications/project/engineextension/PhabricatorProjectsMembershipIndexEngineExtension.php',
     'PhabricatorProjectsPolicyRule' => 'applications/project/policyrule/PhabricatorProjectsPolicyRule.php',
     'PhabricatorProjectsSearchEngineAttachment' => 'applications/project/engineextension/PhabricatorProjectsSearchEngineAttachment.php',
     'PhabricatorProjectsSearchEngineExtension' => 'applications/project/engineextension/PhabricatorProjectsSearchEngineExtension.php',
+    'PhabricatorProjectsWatchersSearchEngineAttachment' => 'applications/project/engineextension/PhabricatorProjectsWatchersSearchEngineAttachment.php',
     'PhabricatorProtocolAdapter' => 'infrastructure/daemon/bot/adapter/PhabricatorProtocolAdapter.php',
     'PhabricatorPygmentSetupCheck' => 'applications/config/check/PhabricatorPygmentSetupCheck.php',
     'PhabricatorQuery' => 'infrastructure/query/PhabricatorQuery.php',
@@ -3022,6 +3027,9 @@ phutil_register_library_map(array(
     'PhabricatorRepositoryMirrorQuery' => 'applications/repository/query/PhabricatorRepositoryMirrorQuery.php',
     'PhabricatorRepositoryParsedChange' => 'applications/repository/data/PhabricatorRepositoryParsedChange.php',
     'PhabricatorRepositoryPullEngine' => 'applications/repository/engine/PhabricatorRepositoryPullEngine.php',
+    'PhabricatorRepositoryPullEvent' => 'applications/repository/storage/PhabricatorRepositoryPullEvent.php',
+    'PhabricatorRepositoryPullEventPHIDType' => 'applications/repository/phid/PhabricatorRepositoryPullEventPHIDType.php',
+    'PhabricatorRepositoryPullEventQuery' => 'applications/repository/query/PhabricatorRepositoryPullEventQuery.php',
     'PhabricatorRepositoryPullLocalDaemon' => 'applications/repository/daemon/PhabricatorRepositoryPullLocalDaemon.php',
     'PhabricatorRepositoryPushEvent' => 'applications/repository/storage/PhabricatorRepositoryPushEvent.php',
     'PhabricatorRepositoryPushEventPHIDType' => 'applications/repository/phid/PhabricatorRepositoryPushEventPHIDType.php',
@@ -3365,6 +3373,7 @@ phutil_register_library_map(array(
     'PhabricatorUserEmail' => 'applications/people/storage/PhabricatorUserEmail.php',
     'PhabricatorUserEmailTestCase' => 'applications/people/storage/__tests__/PhabricatorUserEmailTestCase.php',
     'PhabricatorUserFulltextEngine' => 'applications/people/search/PhabricatorUserFulltextEngine.php',
+    'PhabricatorUserIconField' => 'applications/people/customfield/PhabricatorUserIconField.php',
     'PhabricatorUserLog' => 'applications/people/storage/PhabricatorUserLog.php',
     'PhabricatorUserLogView' => 'applications/people/view/PhabricatorUserLogView.php',
     'PhabricatorUserPHIDResolver' => 'applications/phid/resolver/PhabricatorUserPHIDResolver.php',
@@ -4701,6 +4710,7 @@ phutil_register_library_map(array(
     'DiffusionPreCommitRefRepositoryHeraldField' => 'DiffusionPreCommitRefHeraldField',
     'DiffusionPreCommitRefRepositoryProjectsHeraldField' => 'DiffusionPreCommitRefHeraldField',
     'DiffusionPreCommitRefTypeHeraldField' => 'DiffusionPreCommitRefHeraldField',
+    'DiffusionPullEventGarbageCollector' => 'PhabricatorGarbageCollector',
     'DiffusionPushCapability' => 'PhabricatorPolicyCapability',
     'DiffusionPushEventViewController' => 'DiffusionPushLogController',
     'DiffusionPushLogController' => 'DiffusionController',
@@ -5690,8 +5700,6 @@ phutil_register_library_map(array(
     'PHUIStatusListView' => 'AphrontTagView',
     'PHUITagExample' => 'PhabricatorUIExample',
     'PHUITagView' => 'AphrontTagView',
-    'PHUITextExample' => 'PhabricatorUIExample',
-    'PHUITextView' => 'AphrontTagView',
     'PHUITimelineEventView' => 'AphrontView',
     'PHUITimelineExample' => 'PhabricatorUIExample',
     'PHUITimelineView' => 'AphrontView',
@@ -7101,6 +7109,7 @@ phutil_register_library_map(array(
     'PhabricatorPeopleEmpowerController' => 'PhabricatorPeopleController',
     'PhabricatorPeopleExternalPHIDType' => 'PhabricatorPHIDType',
     'PhabricatorPeopleHovercardEngineExtension' => 'PhabricatorHovercardEngineExtension',
+    'PhabricatorPeopleIconSet' => 'PhabricatorIconSet',
     'PhabricatorPeopleInviteController' => 'PhabricatorPeopleController',
     'PhabricatorPeopleInviteListController' => 'PhabricatorPeopleInviteController',
     'PhabricatorPeopleInviteSendController' => 'PhabricatorPeopleInviteController',
@@ -7110,11 +7119,13 @@ phutil_register_library_map(array(
     'PhabricatorPeopleLogSearchEngine' => 'PhabricatorApplicationSearchEngine',
     'PhabricatorPeopleLogsController' => 'PhabricatorPeopleController',
     'PhabricatorPeopleMainMenuBarExtension' => 'PhabricatorMainMenuBarExtension',
+    'PhabricatorPeopleManageProfilePanel' => 'PhabricatorProfilePanel',
     'PhabricatorPeopleNewController' => 'PhabricatorPeopleController',
     'PhabricatorPeopleNoOwnerDatasource' => 'PhabricatorTypeaheadDatasource',
     'PhabricatorPeopleOwnerDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
     'PhabricatorPeopleProfileController' => 'PhabricatorPeopleController',
     'PhabricatorPeopleProfileEditController' => 'PhabricatorPeopleProfileController',
+    'PhabricatorPeopleProfileManageController' => 'PhabricatorPeopleProfileController',
     'PhabricatorPeopleProfilePanelEngine' => 'PhabricatorProfilePanelEngine',
     'PhabricatorPeopleProfilePictureController' => 'PhabricatorPeopleProfileController',
     'PhabricatorPeopleProfileViewController' => 'PhabricatorPeopleProfileController',
@@ -7298,7 +7309,6 @@ phutil_register_library_map(array(
     'PhabricatorProjectHeraldAction' => 'HeraldAction',
     'PhabricatorProjectHeraldAdapter' => 'HeraldAdapter',
     'PhabricatorProjectHeraldFieldGroup' => 'HeraldFieldGroup',
-    'PhabricatorProjectHistoryController' => 'PhabricatorProjectController',
     'PhabricatorProjectIconSet' => 'PhabricatorIconSet',
     'PhabricatorProjectIconsConfigOptionType' => 'PhabricatorConfigJSONOptionType',
     'PhabricatorProjectListController' => 'PhabricatorProjectController',
@@ -7309,6 +7319,8 @@ phutil_register_library_map(array(
     'PhabricatorProjectLogicalOrNotDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
     'PhabricatorProjectLogicalUserDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
     'PhabricatorProjectLogicalViewerDatasource' => 'PhabricatorTypeaheadDatasource',
+    'PhabricatorProjectManageController' => 'PhabricatorProjectController',
+    'PhabricatorProjectManageProfilePanel' => 'PhabricatorProfilePanel',
     'PhabricatorProjectMaterializedMemberEdgeType' => 'PhabricatorEdgeType',
     'PhabricatorProjectMemberListView' => 'PhabricatorProjectUserListView',
     'PhabricatorProjectMemberOfProjectEdgeType' => 'PhabricatorEdgeType',
@@ -7361,10 +7373,12 @@ phutil_register_library_map(array(
     'PhabricatorProjectsEditEngineExtension' => 'PhabricatorEditEngineExtension',
     'PhabricatorProjectsEditField' => 'PhabricatorTokenizerEditField',
     'PhabricatorProjectsFulltextEngineExtension' => 'PhabricatorFulltextEngineExtension',
+    'PhabricatorProjectsMembersSearchEngineAttachment' => 'PhabricatorSearchEngineAttachment',
     'PhabricatorProjectsMembershipIndexEngineExtension' => 'PhabricatorIndexEngineExtension',
     'PhabricatorProjectsPolicyRule' => 'PhabricatorPolicyRule',
     'PhabricatorProjectsSearchEngineAttachment' => 'PhabricatorSearchEngineAttachment',
     'PhabricatorProjectsSearchEngineExtension' => 'PhabricatorSearchEngineExtension',
+    'PhabricatorProjectsWatchersSearchEngineAttachment' => 'PhabricatorSearchEngineAttachment',
     'PhabricatorProtocolAdapter' => 'Phobject',
     'PhabricatorPygmentSetupCheck' => 'PhabricatorSetupCheck',
     'PhabricatorQuery' => 'Phobject',
@@ -7463,6 +7477,12 @@ phutil_register_library_map(array(
     'PhabricatorRepositoryMirrorQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'PhabricatorRepositoryParsedChange' => 'Phobject',
     'PhabricatorRepositoryPullEngine' => 'PhabricatorRepositoryEngine',
+    'PhabricatorRepositoryPullEvent' => array(
+      'PhabricatorRepositoryDAO',
+      'PhabricatorPolicyInterface',
+    ),
+    'PhabricatorRepositoryPullEventPHIDType' => 'PhabricatorPHIDType',
+    'PhabricatorRepositoryPullEventQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'PhabricatorRepositoryPullLocalDaemon' => 'PhabricatorDaemon',
     'PhabricatorRepositoryPushEvent' => array(
       'PhabricatorRepositoryDAO',
@@ -7851,6 +7871,7 @@ phutil_register_library_map(array(
     'PhabricatorUserEmail' => 'PhabricatorUserDAO',
     'PhabricatorUserEmailTestCase' => 'PhabricatorTestCase',
     'PhabricatorUserFulltextEngine' => 'PhabricatorFulltextEngine',
+    'PhabricatorUserIconField' => 'PhabricatorUserCustomField',
     'PhabricatorUserLog' => array(
       'PhabricatorUserDAO',
       'PhabricatorPolicyInterface',

src/applications/almanac/application/PhabricatorAlmanacApplication.php

@@ -14,7 +14,7 @@ final class PhabricatorAlmanacApplication extends PhabricatorApplication {
     return pht('Service Directory');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-server';
   }
 

src/applications/almanac/controller/AlmanacConsoleController.php

@@ -16,21 +16,21 @@ final class AlmanacConsoleController extends AlmanacController {
       id(new PHUIObjectItemView())
         ->setHeader(pht('Services'))
         ->setHref($this->getApplicationURI('service/'))
-        ->setFontIcon('fa-plug')
+        ->setIcon('fa-plug')
         ->addAttribute(pht('Manage Almanac services.')));
 
     $menu->addItem(
       id(new PHUIObjectItemView())
         ->setHeader(pht('Devices'))
         ->setHref($this->getApplicationURI('device/'))
-        ->setFontIcon('fa-server')
+        ->setIcon('fa-server')
         ->addAttribute(pht('Manage Almanac devices.')));
 
     $menu->addItem(
       id(new PHUIObjectItemView())
         ->setHeader(pht('Networks'))
         ->setHref($this->getApplicationURI('network/'))
-        ->setFontIcon('fa-globe')
+        ->setIcon('fa-globe')
         ->addAttribute(pht('Manage Almanac networks.')));
 
     $crumbs = $this->buildApplicationCrumbs();

src/applications/almanac/controller/AlmanacController.php

@@ -33,7 +33,7 @@ abstract class AlmanacController
     Javelin::initBehavior('phabricator-tooltips', array());
 
     $icon_builtin = id(new PHUIIconView())
-      ->setIconFont('fa-circle')
+      ->setIcon('fa-circle')
       ->addSigil('has-tooltip')
       ->setMetadata(
         array(
@@ -42,7 +42,7 @@ abstract class AlmanacController
         ));
 
     $icon_custom = id(new PHUIIconView())
-      ->setIconFont('fa-circle-o grey')
+      ->setIcon('fa-circle-o grey')
       ->addSigil('has-tooltip')
       ->setMetadata(
         array(
@@ -166,9 +166,7 @@ abstract class AlmanacController
       ->setWorkflow(true)
       ->setDisabled(!$can_edit)
       ->setText(pht('Add Property'))
-      ->setIcon(
+      ->setIcon('fa-plus');
-        id(new PHUIIconView())
-          ->setIconFont('fa-plus'));
 
     $header = id(new PHUIHeaderView())
       ->setHeader(pht('Properties'))

src/applications/almanac/controller/AlmanacDeviceViewController.php

@@ -132,9 +132,7 @@ final class AlmanacDeviceViewController
           ->setWorkflow(!$can_edit)
           ->setDisabled(!$can_edit)
           ->setText(pht('Add Interface'))
-          ->setIcon(
+          ->setIcon('fa-plus'));
-            id(new PHUIIconView())
-              ->setIconFont('fa-plus')));
 
     return id(new PHUIObjectBoxView())
       ->setHeader($header)
@@ -185,7 +183,7 @@ final class AlmanacDeviceViewController
           ->setText(pht('Generate Keypair'))
           ->setIcon(
             id(new PHUIIconView())
-              ->setIconFont('fa-lock')))
+              ->setIcon('fa-lock')))
       ->addActionLink(
         id(new PHUIButtonView())
           ->setTag('a')
@@ -195,7 +193,7 @@ final class AlmanacDeviceViewController
           ->setText(pht('Upload Public Key'))
           ->setIcon(
             id(new PHUIIconView())
-              ->setIconFont('fa-upload')));
+              ->setIcon('fa-upload')));
 
     return id(new PHUIObjectBoxView())
       ->setHeader($header)
@@ -221,7 +219,7 @@ final class AlmanacDeviceViewController
     $handles = $viewer->loadHandles(mpull($services, 'getPHID'));
 
     $icon_lock = id(new PHUIIconView())
-      ->setIconFont('fa-lock');
+      ->setIcon('fa-lock');
 
     $rows = array();
     foreach ($services as $service) {

src/applications/almanac/controller/AlmanacServiceViewController.php

@@ -134,9 +134,7 @@ final class AlmanacServiceViewController
           ->setWorkflow(!$can_edit)
           ->setDisabled(!$can_edit)
           ->setText(pht('Add Binding'))
-          ->setIcon(
+          ->setIcon('fa-plus'));
-            id(new PHUIIconView())
-              ->setIconFont('fa-plus')));
 
     return id(new PHUIObjectBoxView())
       ->setHeader($header)

src/applications/audit/application/PhabricatorAuditApplication.php

@@ -6,7 +6,7 @@ final class PhabricatorAuditApplication extends PhabricatorApplication {
     return '/audit/';
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-check-circle-o';
   }
 

src/applications/auth/application/PhabricatorAuthApplication.php

@@ -10,7 +10,7 @@ final class PhabricatorAuthApplication extends PhabricatorApplication {
     return '/auth/';
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-key';
   }
 

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

@@ -147,13 +147,11 @@ final class PhabricatorAuthListController
       ->setSeverity($severity)
       ->setErrors($issues);
 
-    $image = id(new PHUIIconView())
-          ->setIconFont('fa-plus');
     $button = id(new PHUIButtonView())
         ->setTag('a')
         ->setColor(PHUIButtonView::SIMPLE)
         ->setHref($this->getApplicationURI('config/new/'))
-        ->setIcon($image)
+        ->setIcon('fa-plus')
         ->setDisabled(!$can_manage)
         ->setText(pht('Add Provider'));
 

src/applications/auth/data/PhabricatorAuthInviteAction.php

@@ -88,7 +88,7 @@ final class PhabricatorAuthInviteAction extends Phobject {
     }
 
     return id(new PHUIIconView())
-      ->setIconFont("{$icon} {$color}");
+      ->setIcon("{$icon} {$color}");
   }
 
   public static function newActionListFromAddresses(

src/applications/auth/view/PhabricatorAuthSSHKeyTableView.php

@@ -45,9 +45,9 @@ final class PhabricatorAuthSSHKeyTableView extends AphrontView {
     }
 
     $trusted_icon = id(new PHUIIconView())
-      ->setIconFont('fa-star blue');
+      ->setIcon('fa-star blue');
     $untrusted_icon = id(new PHUIIconView())
-      ->setIconFont('fa-times grey');
+      ->setIcon('fa-times grey');
 
     $rows = array();
     foreach ($keys as $key) {

src/applications/badges/application/PhabricatorBadgesApplication.php

@@ -14,7 +14,7 @@ final class PhabricatorBadgesApplication extends PhabricatorApplication {
     return pht('Achievements and Notority');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-trophy';
   }
 

src/applications/badges/query/PhabricatorBadgesSearchEngine.php

@@ -147,7 +147,7 @@ final class PhabricatorBadgesSearchEngine
       ->setHref('/badges/create/')
       ->setColor(PHUIButtonView::GREEN);
 
-    $icon = $this->getApplication()->getFontIcon();
+    $icon = $this->getApplication()->getIcon();
     $app_name =  $this->getApplication()->getName();
     $view = id(new PHUIBigInfoView())
       ->setIcon($icon)

src/applications/base/PhabricatorApplication.php

@@ -155,7 +155,7 @@ abstract class PhabricatorApplication
     return null;
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-puzzle-piece';
   }
 

src/applications/base/controller/PhabricatorController.php

@@ -352,7 +352,7 @@ abstract class PhabricatorController extends AphrontController {
 
     $application = $this->getCurrentApplication();
     if ($application) {
-      $icon = $application->getFontIcon();
+      $icon = $application->getIcon();
       if (!$icon) {
         $icon = 'fa-puzzle';
       }
@@ -400,7 +400,7 @@ abstract class PhabricatorController extends AphrontController {
     }
 
     $icon = id(new PHUIIconView())
-      ->setIconFont($icon_name);
+      ->setIcon($icon_name);
 
     require_celerity_resource('policy-css');
 

src/applications/calendar/application/PhabricatorCalendarApplication.php

@@ -18,7 +18,7 @@ final class PhabricatorCalendarApplication extends PhabricatorApplication {
     return '/calendar/';
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-calendar';
   }
 

src/applications/calendar/controller/PhabricatorCalendarEventViewController.php

@@ -125,16 +125,14 @@ final class PhabricatorCalendarEventViewController
     if ($is_invite_pending) {
       $decline_button = id(new PHUIButtonView())
         ->setTag('a')
-        ->setIcon(id(new PHUIIconView())
+        ->setIcon('fa-times grey')
-          ->setIconFont('fa-times grey'))
         ->setHref($this->getApplicationURI("/event/decline/{$id}/"))
         ->setWorkflow(true)
         ->setText(pht('Decline'));
 
       $accept_button = id(new PHUIButtonView())
         ->setTag('a')
-        ->setIcon(id(new PHUIIconView())
+        ->setIcon('fa-check green')
-          ->setIconFont('fa-check green'))
         ->setHref($this->getApplicationURI("/event/accept/{$id}/"))
         ->setWorkflow(true)
         ->setText(pht('Accept'));

src/applications/celerity/postprocessor/CelerityDefaultPostprocessor.php

@@ -63,7 +63,7 @@ final class CelerityDefaultPostprocessor
       'violet'        => '#8e44ad',
       'lightviolet'   => '#ecdff1',
       'charcoal'      => '#4b4d51',
-      'backdrop'      => '#dadee7',
+      'backdrop'      => '#c4cde0',
       'hoverwhite'    => 'rgba(255,255,255,.6)',
       'hovergrey'     => '#c5cbcf',
       'hoverblue'     => '#eceff5',
@@ -185,20 +185,15 @@ final class CelerityDefaultPostprocessor
       'sh-disabledtext'         => '#a6a6a6',
       'sh-disabledbackground'   => '#f3f3f3',
 
-      // Background color for "light" themes.
+      // Background color for "most" themes.
-      'page.background.light' => '#f7f7f7',
+      'page.background' => '#f1f1f4',
 
       // Background color for "dark" themes.
       'page.background.dark' => '#ebecee',
 
-      // This is the base background color.
+      'menu.profile.text' => 'rgba(255,255,255,.8)',
-      'menu.profile.background' => '#525867',
+      'menu.profile.text.selected' => 'rgba(255,255,255,1)',
-      'menu.profile.background.hover' => '#464b58',
+      'menu.profile.icon.disabled' => 'rgba(255,255,255,.4)',
-      'menu.profile.background.selected' => '#393d48',
-
-      'menu.profile.text' => '#c6c7cb',
-      'menu.profile.text.selected' => '#ffffff',
-      'menu.profile.icon.disabled' => '#b9bcc2',
 
       'menu.main.height' => '44px',
 

src/applications/chatlog/application/PhabricatorChatLogApplication.php

@@ -14,7 +14,7 @@ final class PhabricatorChatLogApplication extends PhabricatorApplication {
     return pht('(Deprecated)');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-coffee';
   }
 

src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php

@@ -213,7 +213,7 @@ final class PhabricatorChatLogChannelLogController
       ->setTag('a')
       ->setHref('#latest')
       ->setText(pht('Jump to Bottom'))
-      ->setIconFont('fa-arrow-circle-down');
+      ->setIcon('fa-arrow-circle-down');
 
     $jump_target = phutil_tag(
       'div',

src/applications/conduit/application/PhabricatorConduitApplication.php

@@ -6,7 +6,7 @@ final class PhabricatorConduitApplication extends PhabricatorApplication {
     return '/conduit/';
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-tty';
   }
 

src/applications/conduit/query/PhabricatorConduitLogSearchEngine.php

@@ -140,7 +140,7 @@ final class PhabricatorConduitLogSearchEngine
           break;
         case ConduitAPIMethod::METHOD_STATUS_UNSTABLE:
           $status = id(new PHUIIconView())
-            ->setIconFont('fa-exclamation-triangle yellow')
+            ->setIcon('fa-exclamation-triangle yellow')
             ->addSigil('has-tooltip')
             ->setMetadata(
               array(
@@ -149,7 +149,7 @@ final class PhabricatorConduitLogSearchEngine
           break;
         case ConduitAPIMethod::METHOD_STATUS_DEPRECATED:
           $status = id(new PHUIIconView())
-            ->setIconFont('fa-exclamation-triangle red')
+            ->setIcon('fa-exclamation-triangle red')
             ->addSigil('has-tooltip')
             ->setMetadata(
               array(
@@ -158,7 +158,7 @@ final class PhabricatorConduitLogSearchEngine
           break;
         default:
           $status = id(new PHUIIconView())
-            ->setIconFont('fa-question-circle')
+            ->setIcon('fa-question-circle')
             ->addSigil('has-tooltip')
             ->setMetadata(
               array(

src/applications/conduit/settings/PhabricatorConduitTokensSettingsPanel.php

@@ -87,23 +87,19 @@ final class PhabricatorConduitTokensSettingsPanel
         'action',
       ));
 
-    $generate_icon = id(new PHUIIconView())
-      ->setIconFont('fa-plus');
     $generate_button = id(new PHUIButtonView())
       ->setText(pht('Generate API Token'))
       ->setHref('/conduit/token/edit/?objectPHID='.$user->getPHID())
       ->setTag('a')
       ->setWorkflow(true)
-      ->setIcon($generate_icon);
+      ->setIcon('fa-plus');
 
-    $terminate_icon = id(new PHUIIconView())
-      ->setIconFont('fa-exclamation-triangle');
     $terminate_button = id(new PHUIButtonView())
       ->setText(pht('Terminate All Tokens'))
       ->setHref('/conduit/token/terminate/?objectPHID='.$user->getPHID())
       ->setTag('a')
       ->setWorkflow(true)
-      ->setIcon($terminate_icon);
+      ->setIcon('fa-exclamation-triangle');
 
     $header = id(new PHUIHeaderView())
       ->setHeader(pht('Active API Tokens'))

src/applications/config/application/PhabricatorConfigApplication.php

@@ -6,7 +6,7 @@ final class PhabricatorConfigApplication extends PhabricatorApplication {
     return '/config/';
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-sliders';
   }
 

src/applications/config/controller/PhabricatorConfigCacheController.php

@@ -39,15 +39,12 @@ final class PhabricatorConfigCacheController
 
     $this->renderCommonProperties($properties, $cache);
 
-    $purge_icon = id(new PHUIIconView())
-      ->setIconFont('fa-exclamation-triangle');
-
     $purge_button = id(new PHUIButtonView())
       ->setText(pht('Purge Caches'))
       ->setHref('/config/cache/purge/')
       ->setTag('a')
       ->setWorkflow(true)
-      ->setIcon($purge_icon);
+      ->setIcon('fa-exclamation-triangle');
 
     $header = id(new PHUIHeaderView())
       ->setHeader(pht('Opcode Cache'))
@@ -161,7 +158,7 @@ final class PhabricatorConfigCacheController
 
   private function renderYes($info) {
     return array(
-      id(new PHUIIconView())->setIconFont('fa-check', 'green'),
+      id(new PHUIIconView())->setIcon('fa-check', 'green'),
       ' ',
       $info,
     );
@@ -169,7 +166,7 @@ final class PhabricatorConfigCacheController
 
   private function renderNo($info) {
     return array(
-      id(new PHUIIconView())->setIconFont('fa-times-circle', 'red'),
+      id(new PHUIIconView())->setIcon('fa-times-circle', 'red'),
       ' ',
       $info,
     );
@@ -177,7 +174,7 @@ final class PhabricatorConfigCacheController
 
   private function renderInfo($info) {
     return array(
-      id(new PHUIIconView())->setIconFont('fa-info-circle', 'grey'),
+      id(new PHUIIconView())->setIcon('fa-info-circle', 'grey'),
       ' ',
       $info,
     );

src/applications/config/controller/PhabricatorConfigDatabaseController.php

@@ -36,7 +36,7 @@ abstract class PhabricatorConfigDatabaseController
     }
 
     return id(new PHUIIconView())
-      ->setIconFont($icon);
+      ->setIcon($icon);
   }
 
   protected function renderAttr($attr, $issue) {
@@ -71,9 +71,7 @@ abstract class PhabricatorConfigDatabaseController
       ->addActionLink(
         id(new PHUIButtonView())
           ->setTag('a')
-          ->setIcon(
+          ->setIcon('fa-book')
-            id(new PHUIIconView())
-              ->setIconFont('fa-book'))
           ->setHref($doc_link)
           ->setText(pht('Learn More')));
   }

src/applications/config/controller/PhabricatorConfigEditController.php

@@ -104,22 +104,43 @@ final class PhabricatorConfigEditController
     if ($errors) {
       $error_view = id(new PHUIInfoView())
         ->setErrors($errors);
-    } else if ($option->getHidden()) {
+    }
-      $msg = pht(
+
+    $status_items = array();
+    if ($option->getHidden()) {
+      $message = pht(
         'This configuration is hidden and can not be edited or viewed from '.
         'the web interface.');
 
-      $error_view = id(new PHUIInfoView())
+      $status_items[] = id(new PHUIStatusItemView())
-        ->setTitle(pht('Configuration Hidden'))
+        ->setIcon('fa-eye-slash red')
-        ->setSeverity(PHUIInfoView::SEVERITY_WARNING)
+        ->setTarget(phutil_tag('strong', array(), pht('Configuration Hidden')))
-        ->appendChild(phutil_tag('p', array(), $msg));
+        ->setNote($message);
     } else if ($option->getLocked()) {
+      $message = $option->getLockedMessage();
 
-      $msg = $option->getLockedMessage();
+      $status_items[] = id(new PHUIStatusItemView())
-      $error_view = id(new PHUIInfoView())
+        ->setIcon('fa-lock red')
-        ->setTitle(pht('Configuration Locked'))
+        ->setTarget(phutil_tag('strong', array(), pht('Configuration Locked')))
-        ->setSeverity(PHUIInfoView::SEVERITY_NOTICE)
+        ->setNote($message);
-        ->appendChild(phutil_tag('p', array(), $msg));
+    }
+
+    if ($status_items) {
+      $doc_href = PhabricatorEnv::getDoclink(
+        'Configuration Guide: Locked and Hidden Configuration');
+
+      $doc_link = phutil_tag(
+        'a',
+        array(
+          'href' => $doc_href,
+          'target' => '_blank',
+        ),
+        pht('Configuration Guide: Locked and Hidden Configuration'));
+
+      $status_items[] = id(new PHUIStatusItemView())
+        ->setIcon('fa-book')
+        ->setTarget(phutil_tag('strong', array(), pht('Learn More')))
+        ->setNote($doc_link);
     }
 
     if ($option->getHidden() || $option->getLocked()) {
@@ -144,11 +165,30 @@ final class PhabricatorConfigEditController
 
     $form
       ->setUser($viewer)
-      ->addHiddenInput('issue', $request->getStr('issue'))
+      ->addHiddenInput('issue', $request->getStr('issue'));
+
+    if ($status_items) {
+      $status_view = id(new PHUIStatusListView());
+
+      foreach ($status_items as $status_item) {
+        $status_view->addItem($status_item);
+      }
+
+      $form->appendControl(
+        id(new AphrontFormMarkupControl())
+          ->setValue($status_view));
+    }
+
+    $description = $option->getDescription();
+    if (strlen($description)) {
+      $description_view = new PHUIRemarkupView($viewer, $description);
+
+      $form
         ->appendChild(
           id(new AphrontFormMarkupControl())
             ->setLabel(pht('Description'))
-          ->setValue($description));
+            ->setValue($description_view));
+    }
 
     if ($group) {
       $extra = $group->renderContextualDescription(

src/applications/config/controller/PhabricatorConfigListController.php

@@ -53,7 +53,7 @@ final class PhabricatorConfigListController
           ->setHeader($group->getName())
           ->setHref('/config/group/'.$group->getKey().'/')
           ->addAttribute($group->getDescription())
-          ->setFontIcon($group->getFontIcon());
+          ->setIcon($group->getIcon());
         $list->addItem($item);
       }
     }

src/applications/config/controller/PhabricatorConfigWelcomeController.php

@@ -374,7 +374,7 @@ final class PhabricatorConfigWelcomeController
     $viewer = $request->getUser();
 
     $icon = id(new PHUIIconView())
-      ->setIconFont($icon.' fa-2x');
+      ->setIcon($icon.' fa-2x');
 
     $content = PhabricatorMarkupEngine::renderOneObject(
       id(new PhabricatorMarkupOneOff())->setContent($content),

src/applications/config/management/PhabricatorConfigManagementSetWorkflow.php

@@ -141,9 +141,10 @@ final class PhabricatorConfigManagementSetWorkflow
     if ($option->getLocked() && $use_database) {
       throw new PhutilArgumentUsageException(
         pht(
-          "Config key '%s' is locked and can only be set in local ".
+          'Config key "%s" is locked and can only be set in local '.
-          "configuration.",
+          'configuration. To learn more, see "%s" in the documentation.',
-          $key));
+          $key,
+          pht('Configuration Guide: Locked and Hidden Configuration')));
     }
 
     try {

src/applications/config/module/PhabricatorConfigPHIDModule.php

@@ -23,9 +23,9 @@ final class PhabricatorConfigPHIDModule extends PhabricatorConfigModule {
         $app = PhabricatorApplication::getByClass($class_name);
         $app_name = $app->getName();
 
-        $icon = $app->getFontIcon();
+        $icon = $app->getIcon();
         if ($icon) {
-          $app_icon = id(new PHUIIconView())->setIconFont($icon);
+          $app_icon = id(new PHUIIconView())->setIcon($icon);
         } else {
           $app_icon = null;
         }
@@ -36,7 +36,7 @@ final class PhabricatorConfigPHIDModule extends PhabricatorConfigModule {
 
       $icon = $type->getTypeIcon();
       if ($icon) {
-        $type_icon = id(new PHUIIconView())->setIconFont($icon);
+        $type_icon = id(new PHUIIconView())->setIcon($icon);
       } else {
         $type_icon = null;
       }

src/applications/config/option/PhabricatorAWSConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorAWSConfigOptions
     return pht('Configure integration with AWS (EC2, SES, S3, etc).');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-server';
   }
 

src/applications/config/option/PhabricatorAccessLogConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorAccessLogConfigOptions
     return pht('Configure the access logs, which log HTTP/SSH requests.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-list';
   }
 

src/applications/config/option/PhabricatorApplicationConfigOptions.php

@@ -7,7 +7,7 @@ abstract class PhabricatorApplicationConfigOptions extends Phobject {
   abstract public function getGroup();
   abstract public function getOptions();
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-sliders';
   }
 

src/applications/config/option/PhabricatorAuthenticationConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorAuthenticationConfigOptions
     return pht('Options relating to authentication.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-key';
   }
 

src/applications/config/option/PhabricatorClusterConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorClusterConfigOptions
     return pht('Configure Phabricator to run on a cluster of hosts.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-sitemap';
   }
 

src/applications/config/option/PhabricatorCoreConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorCoreConfigOptions
     return pht('Configure core options, including URIs.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-bullseye';
   }
 

src/applications/config/option/PhabricatorDeveloperConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorDeveloperConfigOptions
     return pht('Options for Phabricator developers, including debugging.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-bug';
   }
 

src/applications/config/option/PhabricatorExtendingPhabricatorConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorExtendingPhabricatorConfigOptions
     return pht('Make Phabricator even cooler!');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-rocket';
   }
 

src/applications/config/option/PhabricatorMailgunConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorMailgunConfigOptions
     return pht('Configure Mailgun integration.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-send-o';
   }
 

src/applications/config/option/PhabricatorMetaMTAConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorMetaMTAConfigOptions
     return pht('Configure Mail.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-send';
   }
 

src/applications/config/option/PhabricatorMySQLConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorMySQLConfigOptions
     return pht('Database configuration.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-database';
   }
 

src/applications/config/option/PhabricatorNotificationConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorNotificationConfigOptions
     return pht('Configure real-time notifications.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-bell';
   }
 

src/applications/config/option/PhabricatorPHDConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorPHDConfigOptions
     return pht('Options relating to PHD (daemons).');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-pied-piper-alt';
   }
 

src/applications/config/option/PhabricatorPHPMailerConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorPHPMailerConfigOptions
     return pht('Configure PHPMailer.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-send-o';
   }
 

src/applications/config/option/PhabricatorPhurlConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorPhurlConfigOptions
     return pht('Options for Phurl.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-link';
   }
 

src/applications/config/option/PhabricatorRecaptchaConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorRecaptchaConfigOptions
     return pht('Configure Recaptcha captchas.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-recycle';
   }
 

src/applications/config/option/PhabricatorSMSConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorSMSConfigOptions
     return pht('Configure SMS.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-mobile';
   }
 

src/applications/config/option/PhabricatorSecurityConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorSecurityConfigOptions
     return pht('Security options.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-lock';
   }
 

src/applications/config/option/PhabricatorSendGridConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorSendGridConfigOptions
     return pht('Configure SendGrid integration.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-send-o';
   }
 

src/applications/config/option/PhabricatorSyntaxHighlightingConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorSyntaxHighlightingConfigOptions
     return pht('Options relating to syntax highlighting source code.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-code';
   }
 
@@ -102,9 +102,8 @@ final class PhabricatorSyntaxHighlightingConfigOptions
           'python' => 'Python',
           'rainbow' => 'Rainbow',
           'remarkup' => 'Remarkup',
-          'rest' => 'reStructuredText',
-          'robotframework' => 'RobotFramework',
           'rst' => 'reStructuredText',
+          'robotframework' => 'RobotFramework',
           'ruby' => 'Ruby',
           'sql' => 'SQL',
           'tex' => 'LaTeX',

src/applications/config/option/PhabricatorTranslationsConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorTranslationsConfigOptions
     return pht('Options relating to translations.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-globe';
   }
 

src/applications/config/option/PhabricatorUIConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorUIConfigOptions
     return pht('Configure the Phabricator UI, including colors.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-magnet';
   }
 
@@ -25,7 +25,6 @@ final class PhabricatorUIConfigOptions
     $experimental_link = 'https://secure.phabricator.com/T4214';
     $options = array(
       'blindigo' => 'blindigo',
-      'light' => 'light',
       'red' => 'red',
       'blue' => 'blue',
       'green' => 'green',
@@ -52,7 +51,7 @@ EOJSON;
     return array(
       $this->newOption('ui.header-color', 'enum', 'blindigo')
         ->setDescription(
-          pht('Sets the color of the main header.'))
+          pht('Sets the default color scheme of Phabricator.'))
         ->setEnumOptions($options),
       $this->newOption('ui.footer-items', 'list<wild>', array())
         ->setSummary(

src/applications/conpherence/application/PhabricatorConpherenceApplication.php

@@ -14,7 +14,7 @@ final class PhabricatorConpherenceApplication extends PhabricatorApplication {
     return pht('Chat with Others');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-comments';
   }
 

src/applications/conpherence/config/ConpherenceConfigOptions.php

@@ -11,7 +11,7 @@ final class ConpherenceConfigOptions
     return pht('Configure Conpherence messaging.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-comments';
   }
 

src/applications/conpherence/controller/ConpherenceWidgetController.php

@@ -57,7 +57,7 @@ final class ConpherenceWidgetController extends ConpherenceController {
 
     $widgets = array();
     $new_icon = id(new PHUIIconView())
-      ->setIconFont('fa-plus')
+      ->setIcon('fa-plus')
       ->setHref($this->getWidgetURI())
       ->setMetadata(array('widget' => null))
       ->addSigil('conpherence-widget-adder');

src/applications/conpherence/query/ConpherenceThreadSearchEngine.php

@@ -149,7 +149,7 @@ final class ConpherenceThreadSearchEngine
 
       $icon_name = $conpherence->getPolicyIconName($policy_objects);
       $icon = id(new PHUIIconView())
-        ->setIconFont($icon_name);
+        ->setIcon($icon_name);
       $item = id(new PHUIObjectItemView())
         ->setObjectName($conpherence->getMonogram())
         ->setHeader($title)

src/applications/conpherence/view/ConpherenceDurableColumnView.php

@@ -214,7 +214,7 @@ final class ConpherenceDurableColumnView extends AphrontTagView {
     $icon = $conpherence->getPolicyIconName($policy_objects);
     $icon = id(new PHUIIconView())
       ->addClass('mmr')
-      ->setIconFont($icon);
+      ->setIcon($icon);
     return $icon;
   }
 
@@ -277,9 +277,7 @@ final class ConpherenceDurableColumnView extends AphrontTagView {
         ->setTag('a')
         ->setHref('/conpherence/search/')
         ->setColor(PHUIButtonView::GREY)
-        ->setIcon(
+        ->setIcon('fa-search')));
-          id(new PHUIIconView())
-          ->setIconFont('fa-search'))));
   }
 
   private function buildHeader() {

src/applications/conpherence/view/ConpherencePeopleWidgetView.php

@@ -23,7 +23,7 @@ final class ConpherencePeopleWidgetView extends ConpherenceWidgetView {
       $remove_html = '';
       if ($user_phid == $user->getPHID()) {
         $icon = id(new PHUIIconView())
-          ->setIconFont('fa-times lightbluetext');
+          ->setIcon('fa-times lightbluetext');
         $remove_html = javelin_tag(
           'a',
           array(

src/applications/conpherence/view/ConpherenceThreadListView.php

@@ -59,7 +59,7 @@ final class ConpherenceThreadListView extends AphrontView {
     $data = $thread->getDisplayData($user);
     $icon = id(new PHUIIconView())
       ->addClass('msr')
-      ->setIconFont($thread->getPolicyIconName($policy_objects));
+      ->setIcon($thread->getPolicyIconName($policy_objects));
     $title = phutil_tag(
       'span',
       array(),
@@ -109,7 +109,7 @@ final class ConpherenceThreadListView extends AphrontView {
       'conpherence-room-list-header');
     $header->appendChild(
       id(new PHUIIconView())
-      ->setIconFont('fa-search')
+      ->setIcon('fa-search')
       ->setHref('/conpherence/search/')
       ->setText(pht('Search')));
     $menu->addMenuItem($header);

src/applications/countdown/application/PhabricatorCountdownApplication.php

@@ -6,7 +6,7 @@ final class PhabricatorCountdownApplication extends PhabricatorApplication {
     return '/countdown/';
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-rocket';
   }
 

src/applications/countdown/query/PhabricatorCountdownSearchEngine.php

@@ -152,7 +152,7 @@ final class PhabricatorCountdownSearchEngine
       ->setHref('/countdown/create/')
       ->setColor(PHUIButtonView::GREEN);
 
-    $icon = $this->getApplication()->getFontIcon();
+    $icon = $this->getApplication()->getIcon();
     $app_name =  $this->getApplication()->getName();
     $view = id(new PHUIBigInfoView())
       ->setIcon($icon)

src/applications/daemon/application/PhabricatorDaemonsApplication.php

@@ -18,7 +18,7 @@ final class PhabricatorDaemonsApplication extends PhabricatorApplication {
     return "\xE2\x98\xAF";
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-pied-piper-alt';
   }
 

src/applications/dashboard/application/PhabricatorDashboardApplication.php

@@ -14,7 +14,7 @@ final class PhabricatorDashboardApplication extends PhabricatorApplication {
     return pht('Create Custom Pages');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-dashboard';
   }
 

src/applications/dashboard/controller/PhabricatorDashboardPanelListController.php

@@ -55,7 +55,7 @@ final class PhabricatorDashboardPanelListController
       ->setHref('/dashboard/panel/create/')
       ->setColor(PHUIButtonView::GREEN);
 
-    $icon = $this->getApplication()->getFontIcon();
+    $icon = $this->getApplication()->getIcon();
     $app_name =  $this->getApplication()->getName();
     $view = id(new PHUIBigInfoView())
       ->setIcon($icon)

src/applications/dashboard/engine/PhabricatorDashboardPanelRenderingEngine.php

@@ -165,7 +165,7 @@ final class PhabricatorDashboardPanelRenderingEngine extends Phobject {
         break;
     }
     $icon = id(new PHUIIconView())
-      ->setIconFont('fa-warning red msr');
+      ->setIcon('fa-warning red msr');
     $content = id(new PHUIBoxView())
       ->addClass('dashboard-box')
       ->appendChild($icon)
@@ -250,7 +250,7 @@ final class PhabricatorDashboardPanelRenderingEngine extends Phobject {
       $edit_uri->setQueryParam('dashboardID', $dashboard_id);
     }
     $action_edit = id(new PHUIIconView())
-      ->setIconFont('fa-pencil')
+      ->setIcon('fa-pencil')
       ->setWorkflow(true)
       ->setHref((string)$edit_uri);
     $header->addActionIcon($action_edit);
@@ -260,7 +260,7 @@ final class PhabricatorDashboardPanelRenderingEngine extends Phobject {
         '/dashboard/removepanel/'.$dashboard_id.'/'))
         ->setQueryParam('panelPHID', $panel->getPHID());
       $action_remove = id(new PHUIIconView())
-        ->setIconFont('fa-trash-o')
+        ->setIcon('fa-trash-o')
         ->setHref((string)$uri)
         ->setWorkflow(true);
       $header->addActionIcon($action_remove);

src/applications/dashboard/paneltype/PhabricatorDashboardQueryPanelType.php

@@ -117,7 +117,7 @@ final class PhabricatorDashboardQueryPanelType
     $key = $panel->getProperty('key');
     $href = $search_engine->getQueryResultsPageURI($key);
     $icon = id(new PHUIIconView())
-        ->setIconFont('fa-search')
+        ->setIcon('fa-search')
         ->setHref($href);
     $header->addActionIcon($icon);
 

src/applications/dashboard/query/PhabricatorDashboardSearchEngine.php

@@ -181,7 +181,7 @@ final class PhabricatorDashboardSearchEngine
       ->setHref('/dashboard/create/')
       ->setColor(PHUIButtonView::GREEN);
 
-    $icon = $this->getApplication()->getFontIcon();
+    $icon = $this->getApplication()->getIcon();
     $app_name =  $this->getApplication()->getName();
     $view = id(new PHUIBigInfoView())
       ->setIcon($icon)

src/applications/differential/application/PhabricatorDifferentialApplication.php

@@ -14,7 +14,7 @@ final class PhabricatorDifferentialApplication extends PhabricatorApplication {
     return pht('Review Code');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-cog';
   }
 

src/applications/differential/conduit/DifferentialCreateDiffConduitAPIMethod.php

@@ -137,7 +137,7 @@ final class DifferentialCreateDiffConduitAPIMethod
     );
 
     $xactions = array(
-      id(new DifferentialTransaction())
+      id(new DifferentialDiffTransaction())
         ->setTransactionType(DifferentialDiffTransaction::TYPE_DIFF_CREATE)
         ->setNewValue($diff_data_dict),
     );

src/applications/differential/conduit/DifferentialCreateRawDiffConduitAPIMethod.php

@@ -72,13 +72,13 @@ final class DifferentialCreateRawDiffConduitAPIMethod
     );
 
     $xactions = array(
-      id(new DifferentialTransaction())
+      id(new DifferentialDiffTransaction())
         ->setTransactionType(DifferentialDiffTransaction::TYPE_DIFF_CREATE)
         ->setNewValue($diff_data_dict),
     );
 
     if ($request->getValue('viewPolicy')) {
-      $xactions[] = id(new DifferentialTransaction())
+      $xactions[] = id(new DifferentialDiffTransaction())
         ->setTransactionType(PhabricatorTransactions::TYPE_VIEW_POLICY)
         ->setNewValue($request->getValue('viewPolicy'));
     }

src/applications/differential/config/PhabricatorDifferentialConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorDifferentialConfigOptions
     return pht('Configure Differential code review.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-cog';
   }
 

src/applications/differential/constants/DifferentialRevisionStatus.php

@@ -63,7 +63,7 @@ final class DifferentialRevisionStatus extends Phobject {
       ArcanistDifferentialRevisionStatus::getNameForRevisionStatus($status);
 
     $img = id(new PHUIIconView())
-      ->setIconFont(self::getRevisionStatusIcon($status));
+      ->setIcon(self::getRevisionStatusIcon($status));
 
     $tag = phutil_tag(
       'span',

src/applications/differential/doorkeeper/DifferentialDoorkeeperRevisionFeedStoryPublisher.php

@@ -57,16 +57,11 @@ final class DifferentialDoorkeeperRevisionFeedStoryPublisher
   }
 
   public function getObjectTitle($object) {
-    $prefix = $this->getTitlePrefix($object);
-
-    $lines = new PhutilNumber($object->getLineCount());
-    $lines = pht('[Request, %d lines]', $lines);
-
     $id = $object->getID();
 
     $title = $object->getTitle();
 
-    return ltrim("{$prefix} {$lines} D{$id}: {$title}");
+    return "D{$id}: {$title}";
   }
 
   public function getObjectURI($object) {

src/applications/differential/query/DifferentialRevisionSearchEngine.php

@@ -348,7 +348,7 @@ final class DifferentialRevisionSearchEngine
       ->setHref('/differential/diff/create/')
       ->setColor(PHUIButtonView::GREEN);
 
-    $icon = $this->getApplication()->getFontIcon();
+    $icon = $this->getApplication()->getIcon();
     $app_name =  $this->getApplication()->getName();
     $view = id(new PHUIBigInfoView())
       ->setIcon($icon)

src/applications/differential/view/DifferentialChangesetDetailView.php

@@ -206,7 +206,7 @@ final class DifferentialChangesetDetailView extends AphrontView {
     $display_filename = $changeset->getDisplayFilename();
     $display_icon = $this->getFileIcon($display_filename);
     $icon = id(new PHUIIconView())
-      ->setIconFont($display_icon);
+      ->setIcon($display_icon);
 
     $renderer = DifferentialChangesetHTMLRenderer::getHTMLRendererByKey(
       $this->getRenderer());

src/applications/differential/view/DifferentialChangesetFileTreeSideNavBuilder.php

@@ -91,12 +91,12 @@ final class DifferentialChangesetFileTreeSideNavBuilder extends Phobject {
         $href = '#'.$data->getAnchorName();
         $title = $name;
         $icon = id(new PHUIIconView())
-          ->setIconFont('fa-file-text-o bluetext');
+          ->setIcon('fa-file-text-o bluetext');
       } else {
         $name .= '/';
         $title = $path->getFullPath().'/';
         $icon = id(new PHUIIconView())
-          ->setIconFont('fa-folder-open blue');
+          ->setIcon('fa-folder-open blue');
       }
 
       $name_element = phutil_tag(

src/applications/differential/view/DifferentialRevisionListView.php

@@ -131,7 +131,7 @@ final class DifferentialRevisionListView extends AphrontView {
 
       if (isset($icons['draft'])) {
         $draft = id(new PHUIIconView())
-          ->setIconFont('fa-comment yellow')
+          ->setIcon('fa-comment yellow')
           ->addSigil('has-tooltip')
           ->setMetadata(
             array(

src/applications/diffusion/DiffusionPullEventGarbageCollector.php

@@ -0,0 +1,29 @@
+<?php
+
+final class DiffusionPullEventGarbageCollector
+  extends PhabricatorGarbageCollector {
+
+  const COLLECTORCONST = 'diffusion.pull';
+
+  public function getCollectorName() {
+    return pht('Repository Pull Events');
+  }
+
+  public function getDefaultRetentionPolicy() {
+    return phutil_units('30 days in seconds');
+  }
+
+  protected function collectGarbage() {
+    $table = new PhabricatorRepositoryPullEvent();
+    $conn_w = $table->establishConnection('w');
+
+    queryfx(
+      $conn_w,
+      'DELETE FROM %T WHERE epoch < %d LIMIT 100',
+      $table->getTableName(),
+      $this->getGarbageEpoch());
+
+    return ($conn_w->getAffectedRows() == 100);
+  }
+
+}

src/applications/diffusion/application/PhabricatorDiffusionApplication.php

@@ -14,7 +14,7 @@ final class PhabricatorDiffusionApplication extends PhabricatorApplication {
     return '/diffusion/';
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-code';
   }
 

src/applications/diffusion/config/PhabricatorDiffusionConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorDiffusionConfigOptions
     return pht('Configure Diffusion repository browsing.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-code';
   }
 

src/applications/diffusion/controller/DiffusionBrowseController.php

@@ -832,13 +832,11 @@ final class DiffusionBrowseController extends DiffusionController {
     $editor_link = $user->loadEditorLink($path, $line, $repository);
     $template = $user->loadEditorLink($path, '%l', $repository);
 
-    $icon_edit = id(new PHUIIconView())
-      ->setIconFont('fa-pencil');
     $button = id(new PHUIButtonView())
       ->setTag('a')
       ->setText(pht('Open in Editor'))
       ->setHref($editor_link)
-      ->setIcon($icon_edit)
+      ->setIcon('fa-pencil')
       ->setID('editor_link')
       ->setMetadata(array('link_template' => $template))
       ->setDisabled(!$editor_link);
@@ -860,13 +858,11 @@ final class DiffusionBrowseController extends DiffusionController {
       $icon = 'fa-file-text';
     }
 
-    $iconview = id(new PHUIIconView())
-      ->setIconFont($icon);
     $button = id(new PHUIButtonView())
       ->setTag('a')
       ->setText($text)
       ->setHref($href)
-      ->setIcon($iconview);
+      ->setIcon($icon);
 
     return $button;
   }
@@ -1084,10 +1080,10 @@ final class DiffusionBrowseController extends DiffusionController {
       $revision_link = null;
       $commit_link = null;
       $before_link = null;
-      $style = null;
+
-      if ($identifier && !$line['duplicate']) {
       $style = 'background: '.$line['color'].';';
 
+      if ($identifier && !$line['duplicate']) {
         if (isset($commit_links[$identifier])) {
           $commit_link = $commit_links[$identifier];
         }
@@ -1826,7 +1822,7 @@ final class DiffusionBrowseController extends DiffusionController {
       $names = array();
       foreach ($blame_commits as $identifier => $commit) {
         $author = $commit->renderAuthorShortName($handles);
-        $name = $commit->getShortName();
+        $name = $commit->getLocalName();
 
         $authors[$identifier] = $author;
         $names[$identifier] = $name;

src/applications/diffusion/controller/DiffusionCommitController.php

@@ -221,14 +221,12 @@ final class DiffusionCommitController extends DiffusionController {
       $change_panel->setID('toc');
 
       if ($count > self::CHANGES_LIMIT && !$show_all_details) {
-        $icon = id(new PHUIIconView())
-          ->setIconFont('fa-files-o');
 
         $button = id(new PHUIButtonView())
           ->setText(pht('Show All Changes'))
           ->setHref('?show_all=true')
           ->setTag('a')
-          ->setIcon($icon);
+          ->setIcon('fa-files-o');
 
         $warning_view = id(new PHUIInfoView())
           ->setSeverity(PHUIInfoView::SEVERITY_WARNING)

src/applications/diffusion/controller/DiffusionRepositoryController.php

@@ -390,13 +390,10 @@ final class DiffusionRepositoryController extends DiffusionController {
       $header->setSubHeader(pht('Showing %d branches.', $limit));
     }
 
-    $icon = id(new PHUIIconView())
-      ->setIconFont('fa-code-fork');
-
     $button = new PHUIButtonView();
     $button->setText(pht('Show All Branches'));
     $button->setTag('a');
-    $button->setIcon($icon);
+    $button->setIcon('fa-code-fork');
     $button->setHref($drequest->generateURI(
       array(
         'action' => 'branches',
@@ -462,13 +459,10 @@ final class DiffusionRepositoryController extends DiffusionController {
         pht('Showing the %d most recent tags.', $tag_limit));
     }
 
-    $icon = id(new PHUIIconView())
-      ->setIconFont('fa-tag');
-
     $button = new PHUIButtonView();
     $button->setText(pht('Show All Tags'));
     $button->setTag('a');
-    $button->setIcon($icon);
+    $button->setIcon('fa-tag');
     $button->setHref($drequest->generateURI(
       array(
         'action' => 'tags',
@@ -557,7 +551,7 @@ final class DiffusionRepositoryController extends DiffusionController {
     $history_table->setIsHead(true);
 
     $icon = id(new PHUIIconView())
-      ->setIconFont('fa-list-alt');
+      ->setIcon('fa-list-alt');
 
     $button = id(new PHUIButtonView())
       ->setText(pht('View Full History'))
@@ -620,7 +614,7 @@ final class DiffusionRepositoryController extends DiffusionController {
       ->setHeader(pht('Repository'));
 
     $icon = id(new PHUIIconView())
-      ->setIconFont('fa-folder-open');
+      ->setIcon('fa-folder-open');
 
     $button = new PHUIButtonView();
     $button->setText(pht('Browse Repository'));

src/applications/diffusion/controller/DiffusionServeController.php

@@ -2,6 +2,27 @@
 
 final class DiffusionServeController extends DiffusionController {
 
+  private $serviceViewer;
+  private $serviceRepository;
+
+  public function setServiceViewer(PhabricatorUser $viewer) {
+    $this->serviceViewer = $viewer;
+    return $this;
+  }
+
+  public function getServiceViewer() {
+    return $this->serviceViewer;
+  }
+
+  public function setServiceRepository(PhabricatorRepository $repository) {
+    $this->serviceRepository = $repository;
+    return $this;
+  }
+
+  public function getServiceRepository() {
+    return $this->serviceRepository;
+  }
+
   public function isVCSRequest(AphrontRequest $request) {
     $identifier = $this->getRepositoryIdentifierFromRequest($request);
     if ($identifier === null) {
@@ -45,6 +66,75 @@ final class DiffusionServeController extends DiffusionController {
   }
 
   public function handleRequest(AphrontRequest $request) {
+    $service_exception = null;
+    $response = null;
+
+    try {
+      $response = $this->serveRequest($request);
+    } catch (Exception $ex) {
+      $service_exception = $ex;
+    }
+
+    try {
+      $remote_addr = $request->getRemoteAddr();
+      $remote_addr = ip2long($remote_addr);
+
+      $pull_event = id(new PhabricatorRepositoryPullEvent())
+        ->setEpoch(PhabricatorTime::getNow())
+        ->setRemoteAddress($remote_addr)
+        ->setRemoteProtocol('http');
+
+      if ($response) {
+        $pull_event
+          ->setResultType('wild')
+          ->setResultCode($response->getHTTPResponseCode());
+
+        if ($response instanceof PhabricatorVCSResponse) {
+          $pull_event->setProperties(
+            array(
+              'response.message' => $response->getMessage(),
+            ));
+        }
+      } else {
+        $pull_event
+          ->setResultType('exception')
+          ->setResultCode(500)
+          ->setProperties(
+            array(
+              'exception.class' => $ex->getClass(),
+              'exception.message' => $ex->getMessage(),
+            ));
+      }
+
+      $viewer = $this->getServiceViewer();
+      if ($viewer) {
+        $pull_event->setPullerPHID($viewer->getPHID());
+      }
+
+      $repository = $this->getServiceRepository();
+      if ($repository) {
+        $pull_event->setRepositoryPHID($repository->getPHID());
+      }
+
+      $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
+        $pull_event->save();
+      unset($unguarded);
+
+    } catch (Exception $ex) {
+      if ($service_exception) {
+        throw $service_exception;
+      }
+      throw $ex;
+    }
+
+    if ($service_exception) {
+      throw $service_exception;
+    }
+
+    return $response;
+  }
+
+  private function serveRequest(AphrontRequest $request) {
     $identifier = $this->getRepositoryIdentifierFromRequest($request);
 
     // If authentication credentials have been provided, try to find a user
@@ -65,6 +155,8 @@ final class DiffusionServeController extends DiffusionController {
       $viewer = new PhabricatorUser();
     }
 
+    $this->setServiceViewer($viewer);
+
     $allow_public = PhabricatorEnv::getEnvConfig('policy.allow-public');
     $allow_auth = PhabricatorEnv::getEnvConfig('diffusion.allow-http-auth');
     if (!$allow_public) {
@@ -111,6 +203,8 @@ final class DiffusionServeController extends DiffusionController {
       }
     }
 
+    $this->setServiceRepository($repository);
+
     if (!$repository->isTracked()) {
       return new PhabricatorVCSResponse(
         403,

src/applications/diffusion/view/DiffusionBranchTableView.php

@@ -81,7 +81,7 @@ final class DiffusionBranchTableView extends DiffusionView {
       }
 
       $status_icon = id(new PHUIIconView())
-        ->setIconFont($icon)
+        ->setIcon($icon)
         ->addSigil('has-tooltip')
         ->setHref($doc_href)
         ->setMetadata(

src/applications/diffusion/view/DiffusionView.php

@@ -55,7 +55,7 @@ abstract class DiffusionView extends AphrontView {
           'align' => 'E',
         ),
       ),
-      id(new PHUIIconView())->setIconFont('fa-history bluegrey'));
+      id(new PHUIIconView())->setIcon('fa-history bluegrey'));
   }
 
   final public function linkBrowse($path, array $details = array()) {
@@ -95,7 +95,7 @@ abstract class DiffusionView extends AphrontView {
     }
 
     $icon = DifferentialChangeType::getIconForFileType($file_type);
-    $icon_view = id(new PHUIIconView())->setIconFont("{$icon} blue");
+    $icon_view = id(new PHUIIconView())->setIcon($icon);
 
     // If we're rendering a file or directory name, don't show the tooltip.
     if ($display_name !== null) {
@@ -183,7 +183,7 @@ abstract class DiffusionView extends AphrontView {
     $name = HarbormasterBuildable::getBuildableStatusName($status);
 
     $icon_view = id(new PHUIIconView())
-      ->setIconFont($icon.' '.$color);
+      ->setIcon($icon.' '.$color);
 
     $tooltip_view = javelin_tag(
       'span',

src/applications/diviner/application/PhabricatorDivinerApplication.php

@@ -6,7 +6,7 @@ final class PhabricatorDivinerApplication extends PhabricatorApplication {
     return '/diviner/';
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-sun-o';
   }
 

src/applications/diviner/controller/DivinerBookController.php

@@ -33,7 +33,7 @@ final class DivinerBookController extends DivinerController {
       ->setTag('a')
       ->setText(pht('Actions'))
       ->setHref('#')
-      ->setIconFont('fa-bars')
+      ->setIcon('fa-bars')
       ->addClass('phui-mobile-menu')
       ->setDropdownMenu($actions);
 

src/applications/diviner/controller/DivinerMainController.php

@@ -17,14 +17,11 @@ final class DivinerMainController extends DivinerController {
     $crumbs->setBorder(true);
     $crumbs->addTextCrumb(pht('Books'));
 
-    $search_icon = id(new PHUIIconView())
-      ->setIconFont('fa-search');
-
     $query_button = id(new PHUIButtonView())
       ->setTag('a')
       ->setHref($this->getApplicationURI('query/'))
       ->setText(pht('Advanced Search'))
-      ->setIcon($search_icon);
+      ->setIcon('fa-search');
 
     $header = id(new PHUIHeaderView())
       ->setHeader(pht('Documentation Books'))

src/applications/doorkeeper/application/PhabricatorDoorkeeperApplication.php

@@ -14,7 +14,7 @@ final class PhabricatorDoorkeeperApplication extends PhabricatorApplication {
     return pht('Doorkeeper');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-recycle';
   }
 

src/applications/doorkeeper/option/PhabricatorAsanaConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorAsanaConfigOptions
     return pht('Asana integration options.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-exchange';
   }
 

src/applications/drydock/application/PhabricatorDrydockApplication.php

@@ -14,7 +14,7 @@ final class PhabricatorDrydockApplication extends PhabricatorApplication {
     return pht('Allocate Software Resources');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-truck';
   }
 

src/applications/drydock/controller/DrydockBlueprintViewController.php

@@ -168,7 +168,7 @@ final class DrydockBlueprintViewController extends DrydockBlueprintController {
         id(new PHUIButtonView())
           ->setTag('a')
           ->setHref($resources_uri)
-          ->setIconFont('fa-search')
+          ->setIcon('fa-search')
           ->setText(pht('View All')));
 
     return id(new PHUIObjectBoxView())
@@ -233,7 +233,7 @@ final class DrydockBlueprintViewController extends DrydockBlueprintController {
         id(new PHUIButtonView())
           ->setTag('a')
           ->setHref($authorizations_uri)
-          ->setIconFont('fa-search')
+          ->setIcon('fa-search')
           ->setText(pht('View All')));
 
     return id(new PHUIObjectBoxView())

src/applications/drydock/controller/DrydockConsoleController.php

@@ -31,7 +31,7 @@ final class DrydockConsoleController extends DrydockController {
     $menu->addItem(
       id(new PHUIObjectItemView())
         ->setHeader(pht('Blueprints'))
-        ->setFontIcon('fa-map-o')
+        ->setIcon('fa-map-o')
         ->setHref($this->getApplicationURI('blueprint/'))
         ->addAttribute(
           pht(
@@ -41,7 +41,7 @@ final class DrydockConsoleController extends DrydockController {
     $menu->addItem(
       id(new PHUIObjectItemView())
         ->setHeader(pht('Resources'))
-        ->setFontIcon('fa-map')
+        ->setIcon('fa-map')
         ->setHref($this->getApplicationURI('resource/'))
         ->addAttribute(
           pht('View and manage resources Drydock has built, like hosts.')));
@@ -49,14 +49,14 @@ final class DrydockConsoleController extends DrydockController {
     $menu->addItem(
       id(new PHUIObjectItemView())
         ->setHeader(pht('Leases'))
-        ->setFontIcon('fa-link')
+        ->setIcon('fa-link')
         ->setHref($this->getApplicationURI('lease/'))
         ->addAttribute(pht('Manage leases on resources.')));
 
     $menu->addItem(
       id(new PHUIObjectItemView())
         ->setHeader(pht('Repository Operations'))
-        ->setFontIcon('fa-fighter-jet')
+        ->setIcon('fa-fighter-jet')
         ->setHref($this->getApplicationURI('operation/'))
         ->addAttribute(pht('Review the repository operation queue.')));
 

src/applications/drydock/controller/DrydockController.php

@@ -39,9 +39,9 @@ abstract class DrydockController extends PhabricatorController {
       ->execute();
 
     $consumed_yes = id(new PHUIIconView())
-      ->setIconFont('fa-check green');
+      ->setIcon('fa-check green');
     $consumed_no = id(new PHUIIconView())
-      ->setIconFont('fa-clock-o grey');
+      ->setIcon('fa-clock-o grey');
 
     $rows = array();
     foreach ($commands as $command) {
@@ -98,7 +98,7 @@ abstract class DrydockController extends PhabricatorController {
         id(new PHUIButtonView())
           ->setTag('a')
           ->setHref($all_uri)
-          ->setIconFont('fa-search')
+          ->setIcon('fa-search')
           ->setText(pht('View All')));
 
     return id(new PHUIObjectBoxView())