From b0b107aa78bb656d79a5c8f09e3e21a1f0be5f3e Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Thu, 29 Sep 2022 18:18:10 -0400 Subject: [PATCH] Fix TestMerge's MergedAt never being set --- src/Tgstation.Server.Host/Controllers/RepositoryController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tgstation.Server.Host/Controllers/RepositoryController.cs b/src/Tgstation.Server.Host/Controllers/RepositoryController.cs index 48f4e1e777..825c0b9873 100644 --- a/src/Tgstation.Server.Host/Controllers/RepositoryController.cs +++ b/src/Tgstation.Server.Host/Controllers/RepositoryController.cs @@ -538,6 +538,7 @@ namespace Tgstation.Server.Host.Controllers } testMergeToAdd.MergedBy = mergedBy; + testMergeToAdd.MergedAt = DateTimeOffset.UtcNow; foreach (var activeTestMerge in previousRevInfo.ActiveTestMerges) lastRevisionInfo.ActiveTestMerges.Add(activeTestMerge); @@ -839,7 +840,6 @@ namespace Tgstation.Server.Host.Controllers { Author = ex.Message, BodyAtMerge = ex.Message, - MergedAt = DateTimeOffset.UtcNow, TitleAtMerge = ex.Message, Comment = newTestMerge.Comment, Number = newTestMerge.Number,