From f7e7c0606f37d3c2622bafd1083ce5c38ac2a8b3 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Thu, 29 Sep 2022 18:16:52 -0400
Subject: [PATCH 1/4] Update documentation comment

---
 .../Components/Repository/IGitRemoteAdditionalInformation.cs     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Tgstation.Server.Host/Components/Repository/IGitRemoteAdditionalInformation.cs b/src/Tgstation.Server.Host/Components/Repository/IGitRemoteAdditionalInformation.cs
index 4d993bb918..f859817565 100644
--- a/src/Tgstation.Server.Host/Components/Repository/IGitRemoteAdditionalInformation.cs
+++ b/src/Tgstation.Server.Host/Components/Repository/IGitRemoteAdditionalInformation.cs
@@ -18,6 +18,7 @@ namespace Tgstation.Server.Host.Components.Repository
 		/// <param name="repositorySettings">The <see cref="RepositorySettings"/>.</param>
 		/// <param name="cancellationToken">The <see cref="CancellationToken"/> for the operation.</param>
 		/// <returns>A <see cref="Task{TResult}"/> resulting in the <see cref="Models.TestMerge"/> of the <paramref name="parameters"/>.</returns>
+		/// <remarks><see cref="TestMergeApiBase.MergedAt"/> and <see cref="Models.TestMerge.MergedBy"/> will be unset.</remarks>
 		Task<Models.TestMerge> GetTestMerge(
 			TestMergeParameters parameters,
 			RepositorySettings repositorySettings,

From 9642cd73f01e66480ebbe65ce661a4ace135b289 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Thu, 29 Sep 2022 18:17:17 -0400
Subject: [PATCH 2/4] Fix Discord embed local commits not linking

Replace only usage of DateTimeOffset.Now with .UtcNow
---
 src/Tgstation.Server.Host/Components/Deployment/DreamMaker.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Tgstation.Server.Host/Components/Deployment/DreamMaker.cs b/src/Tgstation.Server.Host/Components/Deployment/DreamMaker.cs
index 448180fee0..9fb041e4a0 100644
--- a/src/Tgstation.Server.Host/Components/Deployment/DreamMaker.cs
+++ b/src/Tgstation.Server.Host/Components/Deployment/DreamMaker.cs
@@ -257,6 +257,7 @@ namespace Tgstation.Server.Host.Components.Deployment
 							.Select(x => new Models.RepositorySettings
 							{
 								AccessToken = x.AccessToken,
+								AccessUser = x.AccessUser,
 								ShowTestMergeCommitters = x.ShowTestMergeCommitters,
 								PushTestMergeCommits = x.PushTestMergeCommits,
 								PostTestMergeComment = x.PostTestMergeComment,
@@ -513,7 +514,7 @@ namespace Tgstation.Server.Host.Components.Deployment
 					cancellationToken)
 					;
 
-				logger.LogTrace("Deployment will timeout at {0}", DateTimeOffset.Now + dreamMakerSettings.Timeout.Value);
+				logger.LogTrace("Deployment will timeout at {timeoutTime}", DateTimeOffset.UtcNow + dreamMakerSettings.Timeout.Value);
 				using var timeoutTokenSource = new CancellationTokenSource(dreamMakerSettings.Timeout.Value);
 				var timeoutToken = timeoutTokenSource.Token;
 				using (timeoutToken.Register(() => logger.LogWarning("Deployment timed out!")))

From b0b107aa78bb656d79a5c8f09e3e21a1f0be5f3e Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Thu, 29 Sep 2022 18:18:10 -0400
Subject: [PATCH 3/4] 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,

From b2c149bf8f4429a30741ac26d2ae18580d71c454 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Fri, 30 Sep 2022 01:02:24 -0400
Subject: [PATCH 4/4] Fix system users being able to "change" their PW

---
 src/Tgstation.Server.Host/Controllers/UserController.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Tgstation.Server.Host/Controllers/UserController.cs b/src/Tgstation.Server.Host/Controllers/UserController.cs
index f877cf0bc0..790dce133b 100644
--- a/src/Tgstation.Server.Host/Controllers/UserController.cs
+++ b/src/Tgstation.Server.Host/Controllers/UserController.cs
@@ -221,6 +221,9 @@ namespace Tgstation.Server.Host.Controllers
 
 			if (model.Password != null)
 			{
+				if (model.SystemIdentifier != null)
+					return BadRequest(new ErrorMessageResponse(ErrorCode.UserMismatchPasswordSid));
+
 				var result = TrySetPassword(originalUser, model.Password, false);
 				if (result != null)
 					return result;