diff --git a/doc/82-Changelog.md b/doc/82-Changelog.md index 9cf35591..1c2408e4 100644 --- a/doc/82-Changelog.md +++ b/doc/82-Changelog.md @@ -22,6 +22,9 @@ v1.10.0 (unreleased) * BREAKING: configuration baskets no longer contain originalId (#2549) * FEATURE: exporting/snapshot-logic has been centralized (#2549) +### Configuration Branches +* FEATURE: merge comments can now be proposed (#2604) + ### REST API * FIX: addressing service templates by name has been fixed (#2487) * FEATURE: Stack traces can now be requested (#2570) diff --git a/library/Director/Db/Branch/Branch.php b/library/Director/Db/Branch/Branch.php index 83c26798..cd68ff0a 100644 --- a/library/Director/Db/Branch/Branch.php +++ b/library/Director/Db/Branch/Branch.php @@ -50,6 +50,7 @@ class Branch $self->branchUuid = Uuid::fromBytes(Db\DbUtil::binaryResult($row->uuid)); $self->name = $row->branch_name; $self->owner = $row->owner; + $self->description = $row->description; $self->tsMergeRequest = $row->ts_merge_request; if (isset($row->cnt_activities)) { $self->cntActivities = $row->cnt_activities; @@ -181,6 +182,25 @@ class Branch return $this->name; } + /** + * @since v1.10.0 + * @return string + */ + public function getDescription() + { + return $this->description; + } + + /** + * @since v1.10.0 + * @param ?string $description + * @return void + */ + public function setDescription($description) + { + $this->description = $description; + } + /** * @return string */ diff --git a/library/Director/Db/Branch/BranchStore.php b/library/Director/Db/Branch/BranchStore.php index 78bc88ab..5ed4fc5f 100644 --- a/library/Director/Db/Branch/BranchStore.php +++ b/library/Director/Db/Branch/BranchStore.php @@ -118,7 +118,8 @@ class BranchStore public function setReadyForMerge(Branch $branch) { $update = [ - 'ts_merge_request' => (int) floor(microtime(true) * 1000000) + 'ts_merge_request' => (int) floor(microtime(true) * 1000000), + 'description' => $branch->getDescription(), ]; $name = $branch->getName();