diff --git a/conf/default.conf.php b/conf/default.conf.php index c6ef8d54df..a66dcf1161 100644 --- a/conf/default.conf.php +++ b/conf/default.conf.php @@ -1083,9 +1083,6 @@ // -- Maniphest ------------------------------------------------------------- // - // Deprecated, use 'phabricator.uninstalled-applications' instead. - 'maniphest.enabled' => true, - // Array of custom fields for Maniphest tasks. For details on adding custom // fields to Maniphest, see "Maniphest User Guide: Adding Custom Fields". 'maniphest.custom-fields' => array(), @@ -1099,11 +1096,6 @@ // Defaults to "needs triage". 'maniphest.default-priority' => 90, -// -- Phriction ------------------------------------------------------------- // - - // Deprecated, use 'phabricator.uninstalled-applications' instead. - 'phriction.enabled' => true, - // -- Phame ----------------------------------------------------------------- // // Should Phame users have Disqus comment widget, and if so what's the diff --git a/src/applications/maniphest/application/PhabricatorApplicationManiphest.php b/src/applications/maniphest/application/PhabricatorApplicationManiphest.php index a9fe4ec544..335ce73b4e 100644 --- a/src/applications/maniphest/application/PhabricatorApplicationManiphest.php +++ b/src/applications/maniphest/application/PhabricatorApplicationManiphest.php @@ -10,13 +10,6 @@ public function getBaseURI() { return '/maniphest/'; } - public function isInstalled() { - if (!PhabricatorEnv::getEnvConfig('maniphest.enabled')) { - return false; - } - return parent::isInstalled(); - } - public function getIconName() { return 'maniphest'; } diff --git a/src/applications/maniphest/config/PhabricatorManiphestConfigOptions.php b/src/applications/maniphest/config/PhabricatorManiphestConfigOptions.php index b8e64645d2..3bc9141e4a 100644 --- a/src/applications/maniphest/config/PhabricatorManiphestConfigOptions.php +++ b/src/applications/maniphest/config/PhabricatorManiphestConfigOptions.php @@ -13,9 +13,6 @@ public function getDescription() { public function getOptions() { return array( - $this->newOption('maniphest.enabled', 'bool', true) - ->setDescription(pht( - "Deprecated, use 'phabricator.uninstalled-applications' instead.")), $this->newOption('maniphest.custom-fields', 'wild', array()) ->setSummary(pht("Custom Maniphest fields.")) ->setDescription( diff --git a/src/applications/phriction/application/PhabricatorApplicationPhriction.php b/src/applications/phriction/application/PhabricatorApplicationPhriction.php index 9ee98ff27b..82fda6cce6 100644 --- a/src/applications/phriction/application/PhabricatorApplicationPhriction.php +++ b/src/applications/phriction/application/PhabricatorApplicationPhriction.php @@ -18,13 +18,6 @@ public function getHelpURI() { return PhabricatorEnv::getDoclink('article/Phriction_User_Guide.html'); } - public function isInstalled() { - if (!PhabricatorEnv::getEnvConfig('phriction.enabled')) { - return false; - } - return parent::isInstalled(); - } - public function getTitleGlyph() { return "\xE2\x9A\xA1"; } diff --git a/src/applications/phriction/config/PhabricatorPhrictionConfigOptions.php b/src/applications/phriction/config/PhabricatorPhrictionConfigOptions.php index a8e80e5667..cfa9b0a889 100644 --- a/src/applications/phriction/config/PhabricatorPhrictionConfigOptions.php +++ b/src/applications/phriction/config/PhabricatorPhrictionConfigOptions.php @@ -13,14 +13,6 @@ public function getDescription() { public function getOptions() { return array( - $this->newOption('phriction.enabled', 'bool', true) - ->setBoolOptions( - array( - pht("Enable Phriction"), - pht("Disable Phriction"), - )) - ->setDescription(pht( - "Deprecated, use 'phabricator.uninstalled-applications' instead.")), $this->newOption( 'metamta.phriction.subject-prefix', 'string', '[Phriction]') ->setDescription(pht("Subject prefix for Phriction email.")),