Merge branch 'dev' into aa/invision-auth

.github/workflows/stable-merge.yml

@@ -15,7 +15,7 @@ jobs:
       uses: actions/checkout@v1
 
     - name: Merge master into dev
-      uses: robotology/gh-action-nightly-merge@v1.2.0
+      uses: robotology/gh-action-nightly-merge@v1.3.3
       with:
         stable_branch: 'master'
         development_branch: 'dev'

README.md

@@ -492,3 +492,4 @@ Feel free to ask for help [on the discussions page](https://github.com/tgstation
 * The remainder of the project is licensed under [GNU AGPL v3](http://www.gnu.org/licenses/agpl-3.0.html)
 
 See the files in the `/src/DMAPI` tree for the MIT license
+

SECURITY.md

@@ -9,10 +9,10 @@
 
 ## Reporting a Vulnerability
 
-Vulnerabilities should ideally be reported by directly messaging one of the maintainers on Discord. Maintainers can be found in the [#coderbus](https://discord.gg/Vh8TJp9) guild. Please be sure to provide reproduction steps.
+Vulnerabilities should ideally be reported by directly messaging one of the maintainers on Discord. Maintainers can be found in the [#coderbus](https://discord.gg/Vh8TJp9) guild in the [#hosting-questions](https://discord.com/channels/484170914754330625/653425022966169620) channel. Please be sure to provide reproduction steps.
 
 Here is a list of their discord IDs.
 
-- Cyberboss#0016
+- Dominion#0444
 
 Once reported, they will handle the processing of the security advisory.

build/Version.props

@@ -3,7 +3,7 @@
   <!-- Integration tests will ensure they match across the board -->
   <Import Project="ControlPanelVersion.props" />
   <PropertyGroup>
-    <TgsCoreVersion>4.17.0</TgsCoreVersion>
+    <TgsCoreVersion>4.17.1</TgsCoreVersion>
     <TgsConfigVersion>4.2.0</TgsConfigVersion>
     <TgsApiVersion>9.5.0</TgsApiVersion>
     <TgsApiLibraryVersion>9.4.0</TgsApiLibraryVersion>

src/Tgstation.Server.Host/Components/Chat/Commands/RevisionCommand.cs

@@ -19,7 +19,7 @@ namespace Tgstation.Server.Host.Components.Chat.Commands
 		public string Name => "revision";
 
 		/// <inheritdoc />
-		public string HelpText => "Display live commit sha. Add --repo to view repository revision";
+		public string HelpText => "Display live origin commit sha. Add --repo to view repository revision";
 
 		/// <inheritdoc />
 		public bool AdminOnly => false;
@@ -60,7 +60,7 @@ namespace Tgstation.Server.Host.Components.Chat.Commands
 			{
 				if (watchdog.Status == WatchdogStatus.Offline)
 					return "Server offline!";
-				result = watchdog.ActiveCompileJob?.RevisionInformation.CommitSha;
+				result = watchdog.ActiveCompileJob?.RevisionInformation.OriginCommitSha;
 			}
 
 			return String.Format(CultureInfo.InvariantCulture, "^{0}", result);

src/Tgstation.Server.Host/Jobs/JobManager.cs

@@ -334,7 +334,7 @@ namespace Tgstation.Server.Host.Jobs
 					catch (JobException e)
 					{
 						job.ErrorCode = e.ErrorCode;
-						job.ExceptionDetails = String.IsNullOrWhiteSpace(e.Message) ? e.InnerException?.Message : e.Message;
+						job.ExceptionDetails = String.IsNullOrWhiteSpace(e.Message) ? e.InnerException?.Message : e.Message + $" (Inner exception: {e.InnerException?.Message})";
 						LogException(e);
 					}
 					catch (Exception e)

tests/Tgstation.Server.Host.Tests/Jobs/TestJobException.cs

@@ -11,7 +11,7 @@ namespace Tgstation.Server.Host.Jobs.Tests
 		{
 			new JobException();
 			new JobException("Message");
-			new JobException("Message", new Exception());
+			new JobException("Message", new Exception("Inner Message"));
 		}
 	}
 }