From 555173eb57e746f207106c394356431eb1f37f9b Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Tue, 14 Sep 2021 21:08:18 -0400 Subject: [PATCH 1/3] Update RepositoryController.cs --- src/Tgstation.Server.Host/Controllers/RepositoryController.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Tgstation.Server.Host/Controllers/RepositoryController.cs b/src/Tgstation.Server.Host/Controllers/RepositoryController.cs index 33cfe8d614..91929aaa44 100644 --- a/src/Tgstation.Server.Host/Controllers/RepositoryController.cs +++ b/src/Tgstation.Server.Host/Controllers/RepositoryController.cs @@ -105,7 +105,7 @@ namespace Tgstation.Server.Host.Controllers if (currentModel == default) return Gone(); - currentModel.UpdateSubmodules ??= model.UpdateSubmodules; + currentModel.UpdateSubmodules = model.UpdateSubmodules; currentModel.AccessToken = model.AccessToken; currentModel.AccessUser = model.AccessUser; // intentionally only these fields, user not allowed to change anything else atm var cloneBranch = model.Reference; @@ -143,6 +143,8 @@ namespace Tgstation.Server.Host.Controllers Instance = Instance, }; var api = currentModel.ToApi(); + + await DatabaseContext.Save(cancellationToken).ConfigureAwait(false); await jobManager.RegisterOperation( job, async (core, databaseContextFactory, paramJob, progressReporter, ct) => From 01cf27c2daa82fd7ec77b5f521e1b192ae5a9d60 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sat, 25 Sep 2021 10:40:00 -0400 Subject: [PATCH 2/3] Remove trailing whitespace --- 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 91929aaa44..c1c87b4bf6 100644 --- a/src/Tgstation.Server.Host/Controllers/RepositoryController.cs +++ b/src/Tgstation.Server.Host/Controllers/RepositoryController.cs @@ -143,7 +143,7 @@ namespace Tgstation.Server.Host.Controllers Instance = Instance, }; var api = currentModel.ToApi(); - + await DatabaseContext.Save(cancellationToken).ConfigureAwait(false); await jobManager.RegisterOperation( job, From 42954e03c7b9dfe60d689f9c542477549644d119 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sat, 25 Sep 2021 11:16:38 -0400 Subject: [PATCH 3/3] Fix setting bad recurse submodules option --- 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 c1c87b4bf6..b973e51cef 100644 --- a/src/Tgstation.Server.Host/Controllers/RepositoryController.cs +++ b/src/Tgstation.Server.Host/Controllers/RepositoryController.cs @@ -105,7 +105,7 @@ namespace Tgstation.Server.Host.Controllers if (currentModel == default) return Gone(); - currentModel.UpdateSubmodules = model.UpdateSubmodules; + currentModel.UpdateSubmodules = model.UpdateSubmodules ?? true; currentModel.AccessToken = model.AccessToken; currentModel.AccessUser = model.AccessUser; // intentionally only these fields, user not allowed to change anything else atm var cloneBranch = model.Reference;