From d196b19f2e1a7e21ff871242b23e9f0fa1914468 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Sun, 21 Mar 2021 13:34:18 -0400
Subject: [PATCH 1/2] Fix missing JobController fields

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

diff --git a/src/Tgstation.Server.Host/Controllers/JobController.cs b/src/Tgstation.Server.Host/Controllers/JobController.cs
index 95b7b95634..feb2ea4577 100644
--- a/src/Tgstation.Server.Host/Controllers/JobController.cs
+++ b/src/Tgstation.Server.Host/Controllers/JobController.cs
@@ -69,6 +69,7 @@ namespace Tgstation.Server.Host.Controllers
 						.Jobs
 						.AsQueryable()
 						.Include(x => x.StartedBy)
+						.Include(x => x.CancelledBy)
 						.Where(x => x.Instance.Id == Instance.Id && !x.StoppedAt.HasValue)
 						.OrderByDescending(x => x.StartedAt))),
 				null,
@@ -95,6 +96,7 @@ namespace Tgstation.Server.Host.Controllers
 						.Jobs
 						.AsQueryable()
 						.Include(x => x.StartedBy)
+						.Include(x => x.CancelledBy)
 						.Where(x => x.Instance.Id == Instance.Id)
 						.OrderByDescending(x => x.StartedAt))),
 				null,
@@ -121,6 +123,7 @@ namespace Tgstation.Server.Host.Controllers
 			var job = await DatabaseContext
 				.Jobs
 				.AsQueryable()
+				.Include(x => x.StartedBy)
 				.Where(x => x.Id == id && x.Instance.Id == Instance.Id)
 				.FirstOrDefaultAsync(cancellationToken)
 				.ConfigureAwait(false);
@@ -156,6 +159,7 @@ namespace Tgstation.Server.Host.Controllers
 				.AsQueryable()
 				.Where(x => x.Id == id && x.Instance.Id == Instance.Id)
 				.Include(x => x.StartedBy)
+				.Include(x => x.CancelledBy)
 				.FirstOrDefaultAsync(cancellationToken)
 				.ConfigureAwait(false);
 			if (job == default)

From ba4ae3fc464da5f4362a828879713c8ebf640460 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Sun, 21 Mar 2021 13:34:55 -0400
Subject: [PATCH 2/2] Version bump to 4.10.4

---
 build/Version.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/Version.props b/build/Version.props
index d3356d6a53..c5d6814939 100644
--- a/build/Version.props
+++ b/build/Version.props
@@ -3,7 +3,7 @@
   <!-- Integration tests will ensure they match across the board -->
   <Import Project="ControlPanelVersion.props" />
   <PropertyGroup>
-    <TgsCoreVersion>4.10.3</TgsCoreVersion>
+    <TgsCoreVersion>4.10.4</TgsCoreVersion>
     <TgsConfigVersion>3.0.0</TgsConfigVersion>
     <TgsApiVersion>9.0.1</TgsApiVersion>
     <TgsApiLibraryVersion>9.0.0</TgsApiLibraryVersion>