From d80cd85c767c8a9143cdd0f14bb3f4629b2ca22a Mon Sep 17 00:00:00 2001 From: Drulikar Date: Fri, 14 Feb 2025 20:14:38 -0600 Subject: [PATCH] wrong line --- .../Remote/GitLabRemoteDeploymentManager.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Tgstation.Server.Host/Components/Deployment/Remote/GitLabRemoteDeploymentManager.cs b/src/Tgstation.Server.Host/Components/Deployment/Remote/GitLabRemoteDeploymentManager.cs index 50ada5f495..a25702ac97 100644 --- a/src/Tgstation.Server.Host/Components/Deployment/Remote/GitLabRemoteDeploymentManager.cs +++ b/src/Tgstation.Server.Host/Components/Deployment/Remote/GitLabRemoteDeploymentManager.cs @@ -238,20 +238,20 @@ namespace Tgstation.Server.Host.Components.Deployment.Remote "
Test Merge {4} @ {8}{0}{0}##### Server Instance{0}{5}{1}{0}{0}##### Revision{0}Origin: {6}{0}Merge Request: {2}{0}Server: {7}{3}
{0}", Environment.NewLine, // 0 repositorySettings.ShowTestMergeCommitters!.Value - ? String.Empty - : String.Format( + ? String.Format( CultureInfo.InvariantCulture, "{0}{0}##### Merged By{0}{1}", Environment.NewLine, - testMerge.MergedBy!.Name), // 1 + testMerge.MergedBy!.Name) + : String.Empty, // 1 testMerge.TargetCommitSha, // 2 String.IsNullOrEmpty(testMerge.Comment) - ? String.Format( + ? String.Empty + : String.Format( CultureInfo.InvariantCulture, "{0}{0}##### Comment{0}{1}", Environment.NewLine, - testMerge.Comment) - : String.Empty, // 3 + testMerge.Comment), // 3 updated ? "Updated" : "Deployed", // 4 Metadata.Name, // 5 compileJob.RevisionInformation.OriginCommitSha, // 6