Merge branch 'master' into dev

.github/workflows/ci-suite.yml

@@ -111,7 +111,7 @@ jobs:
           echo "Committing..."
           git commit -m "Deploy code docs to GitHub Pages for workflow run ${{ github.run_number }}" -m "Commit: ${{ github.event.head_commit.id }}"
           echo "Pushing..."
-          git push -f "https://${{ secrets.GITHUB_TOKEN }}@github.com/tgstation/tgstation-server" 2>&1
+          git push -f "https://${{ secrets.DEV_PUSH_TOKEN }}@github.com/tgstation/tgstation-server" 2>&1
 
   docker-build:
     name: Build Docker Image

src/Tgstation.Server.Host/Core/SwaggerConfiguration.cs

@@ -1,4 +1,4 @@
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Net.Http.Headers;
 using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Models;
@@ -93,7 +93,7 @@ namespace Tgstation.Server.Host.Core
 
 			AddDefaultResponse(HttpStatusCode.NotAcceptable, new OpenApiResponse
 			{
-				Description = "Invalid Accept header, TGS requires `Accept: application/json`.",
+				Description = $"Invalid Accept header, TGS requires `{HeaderNames.Accept}: {MediaTypeNames.Application.Json}`.",
 				Content = errorMessageContent
 			});
 

tests/DMAPI/LongRunning/Test.dm

@@ -4,6 +4,7 @@
 
 /world/New()
 	log << "Initial value of sleep_offline: [sleep_offline]"
+	sleep_offline = FALSE
 
 	// Intentionally slow down startup for testing purposes
 	for(var/i in 1 to 10000000)

tests/Tgstation.Server.Tests/AdministrationTest.cs

@@ -1,4 +1,5 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using SQLitePCL;
 using System;
 using System.Linq;
 using System.Runtime.InteropServices;
@@ -59,6 +60,9 @@ namespace Tgstation.Server.Tests
 			}
 			catch (RateLimitException)
 			{
+				if (!String.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("TGS4_TEST_GITHUB_TOKEN")))
+					throw;
+
 				Assert.Inconclusive("GitHub rate limit hit while testing administration endpoint. Set environment variable TGS4_TEST_GITHUB_TOKEN to fix this!");
 				return;	//c# needs the equivalent of [noreturn]
 			}