Page MenuHomePhabricator

D13181.id31919.diff
No OneTemporary

D13181.id31919.diff

diff --git a/src/applications/audit/editor/PhabricatorAuditEditor.php b/src/applications/audit/editor/PhabricatorAuditEditor.php
--- a/src/applications/audit/editor/PhabricatorAuditEditor.php
+++ b/src/applications/audit/editor/PhabricatorAuditEditor.php
@@ -889,6 +889,7 @@
"H{$rule_id}"));
}
}
+
if ($audit_phids) {
$xactions[] = id(new PhabricatorAuditTransaction())
->setTransactionType(PhabricatorAuditActionConstants::ADD_AUDITORS)
@@ -900,15 +901,6 @@
'auditReasonMap', $this->auditReasonMap);
}
- $cc_phids = $adapter->getAddCCMap();
- $add_ccs = array('+' => array());
- foreach ($cc_phids as $phid => $rule_ids) {
- $add_ccs['+'][$phid] = $phid;
- }
- $xactions[] = id(new PhabricatorAuditTransaction())
- ->setTransactionType(PhabricatorTransactions::TYPE_SUBSCRIBERS)
- ->setNewValue($add_ccs);
-
HarbormasterBuildable::applyBuildPlans(
$object->getPHID(),
$object->getRepository()->getPHID(),
diff --git a/src/applications/herald/adapter/HeraldCommitAdapter.php b/src/applications/herald/adapter/HeraldCommitAdapter.php
--- a/src/applications/herald/adapter/HeraldCommitAdapter.php
+++ b/src/applications/herald/adapter/HeraldCommitAdapter.php
@@ -13,7 +13,6 @@
protected $commitData;
private $commitDiff;
- protected $addCCPHIDs = array();
protected $auditMap = array();
protected $buildPlans = array();
@@ -141,6 +140,7 @@
return array_merge(
array(
self::ACTION_ADD_CC,
+ self::ACTION_REMOVE_CC,
self::ACTION_EMAIL,
self::ACTION_AUDIT,
self::ACTION_APPLY_BUILD_PLANS,
@@ -151,6 +151,7 @@
return array_merge(
array(
self::ACTION_ADD_CC,
+ self::ACTION_REMOVE_CC,
self::ACTION_EMAIL,
self::ACTION_FLAG,
self::ACTION_AUDIT,
@@ -220,10 +221,6 @@
return $this->commit->getPHID();
}
- public function getAddCCMap() {
- return $this->addCCPHIDs;
- }
-
public function getAuditMap() {
return $this->auditMap;
}
@@ -491,18 +488,6 @@
foreach ($effects as $effect) {
$action = $effect->getAction();
switch ($action) {
- case self::ACTION_ADD_CC:
- foreach ($effect->getTarget() as $phid) {
- if (empty($this->addCCPHIDs[$phid])) {
- $this->addCCPHIDs[$phid] = array();
- }
- $this->addCCPHIDs[$phid][] = $effect->getRule()->getID();
- }
- $result[] = new HeraldApplyTranscript(
- $effect,
- true,
- pht('Added address to CC.'));
- break;
case self::ACTION_AUDIT:
foreach ($effect->getTarget() as $phid) {
if (empty($this->auditMap[$phid])) {

File Metadata

Mime Type
text/plain
Expires
Sat, Dec 21, 9:44 AM (1 h, 57 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6909792
Default Alt Text
D13181.id31919.diff (2 KB)

Event Timeline