D10827.id26012.diff
No OneTemporary
Actions

Size

783 B

Referenced Files

None

Subscribers

None

D10827.id26012.diff
View Options

	diff --git a/src/applications/maniphest/storage/ManiphestTransaction.php b/src/applications/maniphest/storage/ManiphestTransaction.php
	--- a/src/applications/maniphest/storage/ManiphestTransaction.php
	+++ b/src/applications/maniphest/storage/ManiphestTransaction.php
	@@ -213,6 +213,11 @@
	return 'yellow';
	}

	+ case self::TYPE_MERGED_FROM:
	+ return 'orange';
	+
	+ case self::TYPE_MERGED_INTO:
	+ return 'black';
	}

	return parent::getColor();
	@@ -591,7 +596,7 @@

	case self::TYPE_MERGED_INTO:
	return pht(
	- '%s merged this task into %s.',
	+ '%s closed this task as a duplicate of %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($new));
	break;