From c632139cd40563dd3660694473cf0f2940aec605 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Thu, 25 Feb 2021 17:48:09 -0500 Subject: [PATCH 1/3] Fix GET / always redirecting even with the API header present --- src/Tgstation.Server.Host/Controllers/HomeController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tgstation.Server.Host/Controllers/HomeController.cs b/src/Tgstation.Server.Host/Controllers/HomeController.cs index fe2d94152b..a402527a00 100644 --- a/src/Tgstation.Server.Host/Controllers/HomeController.cs +++ b/src/Tgstation.Server.Host/Controllers/HomeController.cs @@ -163,7 +163,7 @@ namespace Tgstation.Server.Host.Controllers if (ApiHeaders == null) { - if (controlPanelConfiguration.Enable) + if (controlPanelConfiguration.Enable && !Request.Headers.TryGetValue(ApiHeaders.ApiVersionHeader, out _)) { Logger.LogDebug("No API headers on request, redirecting to control panel..."); return Redirect(ControlPanelController.ControlPanelRoute); From 95d178d0fde0ea0ee9724c24106c3926a6cc0313 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Thu, 25 Feb 2021 17:48:17 -0500 Subject: [PATCH 2/3] Adjust clone job message --- .../Controllers/RepositoryController.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Tgstation.Server.Host/Controllers/RepositoryController.cs b/src/Tgstation.Server.Host/Controllers/RepositoryController.cs index 9e3b9faeab..ec9b99d5e1 100644 --- a/src/Tgstation.Server.Host/Controllers/RepositoryController.cs +++ b/src/Tgstation.Server.Host/Controllers/RepositoryController.cs @@ -186,7 +186,13 @@ namespace Tgstation.Server.Host.Controllers var job = new Job { - Description = String.Format(CultureInfo.InvariantCulture, "Clone branch {1} of repository {0}", origin, cloneBranch ?? "master"), + Description = String.Format( + CultureInfo.InvariantCulture, + "Clone{1} repository {0}", + origin, + cloneBranch != null + ? $"\"{cloneBranch}\" branch of" + : String.Empty), StartedBy = AuthenticationContext.User, CancelRightsType = RightsType.Repository, CancelRight = (ulong)RepositoryRights.CancelClone, From c09cbf84409cb33d9ca1713d349d3e5a617e2a7e Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Thu, 25 Feb 2021 17:48:25 -0500 Subject: [PATCH 3/3] Version bump to 4.10.1 --- build/Version.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Version.props b/build/Version.props index 45455a0e05..7e642352bb 100644 --- a/build/Version.props +++ b/build/Version.props @@ -3,7 +3,7 @@ - 4.10.0 + 4.10.1 3.0.0 9.0.0 9.0.0