diff --git a/build/Version.props b/build/Version.props index 3b64b3ff67..306f7948c9 100644 --- a/build/Version.props +++ b/build/Version.props @@ -3,7 +3,7 @@ - 4.6.0 + 4.6.1 2.1.1 7.4.0 8.4.0 diff --git a/src/Tgstation.Server.Host/Controllers/RepositoryController.cs b/src/Tgstation.Server.Host/Controllers/RepositoryController.cs index 88de87bbce..880a8efc96 100644 --- a/src/Tgstation.Server.Host/Controllers/RepositoryController.cs +++ b/src/Tgstation.Server.Host/Controllers/RepositoryController.cs @@ -744,6 +744,9 @@ namespace Tgstation.Server.Host.Controllers revInfoWereLookingFor = dbPull .Where(testRevInfo => { + if (testRevInfo.PrimaryTestMerge == null) + return false; + var testMergeMatch = model.NewTestMerges.Any(testTestMerge => { var numberMatch = testRevInfo.PrimaryTestMerge.Number == testTestMerge.Number;