From 5b1d0f9ed706c7048a11836bf62f078849be17c9 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 3 Apr 2015 16:38:27 -0700
Subject: [PATCH] Remove "metamta.precedence-bulk" option (always enable it)

Summary: Ref T7746. This might possibly improve deliverability. Or might make it worse. Who knows?

Test Plan: `grep`

Reviewers: btrahan

Reviewed By: btrahan

Subscribers: epriestley

Maniphest Tasks: T7746

Differential Revision: https://secure.phabricator.com/D12266
---
 .../config/check/PhabricatorExtraConfigSetupCheck.php     | 4 ++++
 .../config/option/PhabricatorMetaMTAConfigOptions.php     | 8 --------
 .../metamta/storage/PhabricatorMetaMTAMail.php            | 4 +---
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php b/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php
index c7fde5f6e4..b789fe57d0 100644
--- a/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php
+++ b/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php
@@ -241,6 +241,10 @@ final class PhabricatorExtraConfigSetupCheck extends PhabricatorSetupCheck {
       'metamta.differential.reply-handler' => $reply_handler_reason,
       'metamta.maniphest.reply-handler' => $reply_handler_reason,
       'metamta.package.reply-handler' => $reply_handler_reason,
+
+      'metamta.precedence-bulk' => pht(
+        'Phabricator now always sends transaction mail with '.
+        '"Precedence: bulk" to improve deliverability.'),
     );
 
     return $ancient_config;
diff --git a/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php b/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php
index 1bc8d21bdb..bbd58e0d51 100644
--- a/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php
+++ b/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php
@@ -271,14 +271,6 @@ EODOC
           ))
         ->setSummary(pht('Show email preferences link in email.'))
         ->setDescription($email_preferences_description),
-      $this->newOption('metamta.precedence-bulk', 'bool', false)
-        ->setBoolOptions(
-          array(
-            pht('Add "Precedence: bulk" Header'),
-            pht('No "Precedence: bulk" Header'),
-          ))
-        ->setSummary(pht('Control the "Precedence: bulk" header.'))
-        ->setDescription($bulk_description),
       $this->newOption('metamta.re-prefix', 'bool', false)
         ->setBoolOptions(
           array(
diff --git a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
index 4f2fe4821f..7bf19a935a 100644
--- a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
+++ b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
@@ -545,9 +545,7 @@ final class PhabricatorMetaMTAMail extends PhabricatorMetaMTADAO {
             break;
           case 'is-bulk':
             if ($value) {
-              if (PhabricatorEnv::getEnvConfig('metamta.precedence-bulk')) {
-                $mailer->addHeader('Precedence', 'bulk');
-              }
+              $mailer->addHeader('Precedence', 'bulk');
             }
             break;
           case 'thread-id':