Page MenuHomePhabricator
Files F14657227

D7355.diff
No OneTemporary
Actions

D7355.diff
View Options

Index: conf/default.conf.php
===================================================================
--- conf/default.conf.php
+++ conf/default.conf.php
@@ -515,10 +515,6 @@
// address will be stored in an 'From Email' field on the task.
'metamta.maniphest.default-public-author' => null,
- // You can disable the Herald hints in email if users prefer smaller messages.
- // These are the links under the headers "MANAGE HERALD RULES" and
- // "WHY DID I GET THIS EMAIL?". If you set this to true, they will not appear
- // in any mail. Users can still navigate to the links via the web interface.
'metamta.herald.show-hints' => true,
// You can disable the hints under "REPLY HANDLER ACTIONS" if users prefer
Index: src/applications/config/option/PhabricatorMetaMTAConfigOptions.php
===================================================================
--- src/applications/config/option/PhabricatorMetaMTAConfigOptions.php
+++ src/applications/config/option/PhabricatorMetaMTAConfigOptions.php
@@ -72,9 +72,9 @@
$herald_hints_description = $this->deformat(pht(<<<EODOC
You can disable the Herald hints in email if users prefer smaller messages.
-These are the links under the headers "MANAGE HERALD RULES" and "WHY DID I GET
-THIS EMAIL?". If you set this to true, they will not appear in any mail. Users
-can still navigate to the links via the web interface.
+These are the links under the header "WHY DID I GET THIS EMAIL?". If you set
+this to true, they will not appear in any mail. Users can still navigate to
+the links via the web interface.
EODOC
));
Index: src/applications/differential/mail/DifferentialMail.php
===================================================================
--- src/applications/differential/mail/DifferentialMail.php
+++ src/applications/differential/mail/DifferentialMail.php
@@ -278,9 +278,8 @@
$body->addReplySection($reply_handler->getReplyHandlerInstructions());
if ($this->getHeraldTranscriptURI() && $this->isFirstMailToRecipients()) {
- $manage_uri = '/herald/view/differential/';
$xscript_uri = $this->getHeraldTranscriptURI();
- $body->addHeraldSection($manage_uri, $xscript_uri);
+ $body->addHeraldSection($xscript_uri);
}
return $body->render();
Index: src/applications/metamta/view/PhabricatorMetaMTAMailBody.php
===================================================================
--- src/applications/metamta/view/PhabricatorMetaMTAMailBody.php
+++ src/applications/metamta/view/PhabricatorMetaMTAMailBody.php
@@ -50,20 +50,16 @@
/**
* Add a Herald section with a rule management URI and a transcript URI.
*
- * @param string URI to rule management.
* @param string URI to rule transcripts.
* @return this
* @task compose
*/
- public function addHeraldSection($rules_uri, $xscript_uri) {
+ public function addHeraldSection($xscript_uri) {
if (!PhabricatorEnv::getEnvConfig('metamta.herald.show-hints')) {
return $this;
}
$this->addTextSection(
- pht('MANAGE HERALD RULES'),
- PhabricatorEnv::getProductionURI($rules_uri));
- $this->addTextSection(
pht('WHY DID I GET THIS EMAIL?'),
PhabricatorEnv::getProductionURI($xscript_uri));
Index: src/applications/metamta/view/__tests__/PhabricatorMetaMTAMailBodyTestCase.php
===================================================================
--- src/applications/metamta/view/__tests__/PhabricatorMetaMTAMailBodyTestCase.php
+++ src/applications/metamta/view/__tests__/PhabricatorMetaMTAMailBodyTestCase.php
@@ -14,9 +14,6 @@
bass
trout
-MANAGE HERALD RULES
- http://test.com/rules/
-
WHY DID I GET THIS EMAIL?
http://test.com/xscript/
@@ -54,9 +51,6 @@
bass
trout
-MANAGE HERALD RULES
- http://test.com/rules/
-
WHY DID I GET THIS EMAIL?
http://test.com/xscript/
@@ -74,7 +68,7 @@
$body = new PhabricatorMetaMTAMailBody();
$body->addRawSection("salmon");
$body->addTextSection("HEADER", "bass\ntrout\n");
- $body->addHeraldSection("/rules/", "/xscript/");
+ $body->addHeraldSection("/xscript/");
$body->addReplySection("pike");
$this->assertEqual($expect, $body->render());
Index: src/applications/repository/worker/PhabricatorRepositoryCommitHeraldWorker.php
===================================================================
--- src/applications/repository/worker/PhabricatorRepositoryCommitHeraldWorker.php
+++ src/applications/repository/worker/PhabricatorRepositoryCommitHeraldWorker.php
@@ -119,7 +119,6 @@
$xscript_id = $xscript->getID();
- $manage_uri = '/herald/view/commits/';
$why_uri = '/herald/transcript/'.$xscript_id.'/';
$reply_handler = PhabricatorAuditCommentEditor::newReplyHandlerForCommit(
@@ -135,7 +134,7 @@
$body->addTextSection(pht('DIFFERENTIAL REVISION'), $differential);
$body->addTextSection(pht('AFFECTED FILES'), $files);
$body->addReplySection($reply_handler->getReplyHandlerInstructions());
- $body->addHeraldSection($manage_uri, $why_uri);
+ $body->addHeraldSection($why_uri);
$body->addRawSection($inline_patch_text);
$body = $body->render();

File Metadata

Mime Type
text/plain
Expires
Sun, Jan 12, 8:21 PM (19 h, 19 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6987749
Default Alt Text
D7355.diff (5 KB)

Event Timeline

Phabricator · Built by Phacility