Page MenuHomePhabricator
Files F13188623

D12949.diff
No OneTemporary
Actions

D12949.diff
View Options

diff --git a/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php b/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php
--- a/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php
+++ b/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php
@@ -171,6 +171,10 @@
'Phabricator no longer supports global customization of monospaced '.
'fonts.');
+ $public_mail_reason = pht(
+ 'Inbound mail addresses are now configured for each application '.
+ 'in the Applications tool.');
+
$ancient_config += array(
'phid.external-loaders' =>
pht(
@@ -256,6 +260,11 @@
'search.engine-selector' => pht(
'Phabricator now automatically discovers available search engines '.
'at runtime.'),
+
+ 'metamta.files.public-create-email' => $public_mail_reason,
+ 'metamta.maniphest.public-create-email' => $public_mail_reason,
+ 'metamta.maniphest.default-public-author' => $public_mail_reason,
+ 'metamta.paste.public-create-email' => $public_mail_reason,
);
return $ancient_config;
diff --git a/src/applications/files/config/PhabricatorFilesConfigOptions.php b/src/applications/files/config/PhabricatorFilesConfigOptions.php
--- a/src/applications/files/config/PhabricatorFilesConfigOptions.php
+++ b/src/applications/files/config/PhabricatorFilesConfigOptions.php
@@ -157,20 +157,6 @@
"must also configure S3 access keys in the 'Amazon Web Services' ".
"group.")),
$this->newOption(
- 'metamta.files.public-create-email',
- 'string',
- null)
- ->setLocked(true)
- ->setLockedMessage(pht(
- 'This configuration is deprecated. See description for details.'))
- ->setSummary(pht('DEPRECATED - Allow uploaded files via email.'))
- ->setDescription(
- pht(
- 'This config has been deprecated in favor of [[ '.
- '/applications/view/PhabricatorFilesApplication/ | '.
- 'application settings ]], which allow for multiple email '.
- 'addresses and other functionality.')),
- $this->newOption(
'metamta.files.subject-prefix',
'string',
'[File]')
diff --git a/src/applications/maniphest/config/PhabricatorManiphestConfigOptions.php b/src/applications/maniphest/config/PhabricatorManiphestConfigOptions.php
--- a/src/applications/maniphest/config/PhabricatorManiphestConfigOptions.php
+++ b/src/applications/maniphest/config/PhabricatorManiphestConfigOptions.php
@@ -297,57 +297,6 @@
'[Maniphest]')
->setDescription(pht('Subject prefix for Maniphest mail.')),
$this->newOption(
- 'metamta.maniphest.public-create-email',
- 'string',
- null)
- ->setLocked(true)
- ->setLockedMessage(pht(
- 'This configuration is deprecated. See description for details.'))
- ->setSummary(pht('DEPRECATED - Allow filing bugs via email.'))
- ->setDescription(
- pht(
- 'This config has been deprecated in favor of [[ '.
- '/applications/view/PhabricatorManiphestApplication/ | '.
- 'application settings ]], which allow for multiple email '.
- 'addresses and other functionality.'."\n\n".
- 'You can configure an email address like '.
- '"bugs@phabricator.example.com" which will automatically create '.
- 'Maniphest tasks when users send email to it. This relies on the '.
- '"From" address to authenticate users, so it is is not completely '.
- 'secure. To set this up, enter a complete email address like '.
- '"bugs@phabricator.example.com" and then configure mail to that '.
- 'address so it routed to Phabricator (if you\'ve already '.
- 'configured reply handlers, you\'re probably already done). See '.
- '"Configuring Inbound Email" in the documentation for more '.
- 'information.')),
- $this->newOption(
- 'metamta.maniphest.default-public-author',
- 'string',
- null)
- ->setLocked(true)
- ->setLockedMessage(pht(
- 'This configuration is deprecated. See description for details.'))
- ->setSummary(pht(
- 'DEPRECATED - Username anonymous bugs are filed under.'))
- ->setDescription(
- pht(
- 'This config has been deprecated in favor of [[ '.
- '/applications/view/PhabricatorManiphestApplication/ | '.
- 'application settings ]], which allow for multiple email '.
- 'addresses each with its own default author, and other '.
- 'functionality.'."\n\n".
- 'If you enable `metamta.maniphest.public-create-email` and create '.
- 'an email address like "bugs@phabricator.example.com", it will '.
- 'default to rejecting mail which doesn\'t come from a known user. '.
- 'However, you might want to let anyone send email to this '.
- 'address; to do so, set a default author here (a Phabricator '.
- 'username). A typical use of this might be to create a "System '.
- 'Agent" user called "bugs" and use that name here. If you specify '.
- 'a valid username, mail will always be accepted and used to '.
- 'create a task, even if the sender is not a system user. The '.
- 'original email address will be stored in an `From Email` field '.
- 'on the task.')),
- $this->newOption(
'maniphest.priorities.unbreak-now',
'int',
100)
diff --git a/src/applications/maniphest/controller/ManiphestTaskEditController.php b/src/applications/maniphest/controller/ManiphestTaskEditController.php
--- a/src/applications/maniphest/controller/ManiphestTaskEditController.php
+++ b/src/applications/maniphest/controller/ManiphestTaskEditController.php
@@ -684,19 +684,7 @@
'tokenizerID' => $project_tokenizer_id,
));
- $description_control = new PhabricatorRemarkupControl();
- // "Upsell" creating tasks via email in create flows if the instance is
- // configured for this awesomeness.
- $email_create = PhabricatorEnv::getEnvConfig(
- 'metamta.maniphest.public-create-email');
- if (!$task->getID() && $email_create) {
- $email_hint = pht(
- 'You can also create tasks by sending an email to: %s',
- phutil_tag('tt', array(), $email_create));
- $description_control->setCaption($email_hint);
- }
-
- $description_control
+ $description_control = id(new PhabricatorRemarkupControl())
->setLabel(pht('Description'))
->setName('description')
->setID('description-textarea')
@@ -706,7 +694,6 @@
$form
->appendChild($description_control);
-
if ($request->isAjax()) {
$dialog = id(new AphrontDialogView())
->setUser($user)
diff --git a/src/applications/paste/config/PhabricatorPasteConfigOptions.php b/src/applications/paste/config/PhabricatorPasteConfigOptions.php
--- a/src/applications/paste/config/PhabricatorPasteConfigOptions.php
+++ b/src/applications/paste/config/PhabricatorPasteConfigOptions.php
@@ -22,20 +22,6 @@
public function getOptions() {
return array(
$this->newOption(
- 'metamta.paste.public-create-email',
- 'string',
- null)
- ->setLocked(true)
- ->setLockedMessage(pht(
- 'This configuration is deprecated. See description for details.'))
- ->setSummary(pht('DEPRECATED - Allow creating pastes via email.'))
- ->setDescription(
- pht(
- 'This config has been deprecated in favor of [[ '.
- '/applications/view/PhabricatorPasteApplication/ | '.
- 'application settings ]], which allow for multiple email '.
- 'addresses and other functionality.')),
- $this->newOption(
'metamta.paste.subject-prefix',
'string',
'[Paste]')

File Metadata

Mime Type
text/plain
Expires
Sun, May 12, 5:22 AM (3 w, 35 m ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6289856
Default Alt Text
D12949.diff (7 KB)

Event Timeline

Phabricator · Built by Phacility