diff --git a/src/Tgstation.Server.Host/Components/Instance.cs b/src/Tgstation.Server.Host/Components/Instance.cs
index 38932c5277..0973cd9322 100644
--- a/src/Tgstation.Server.Host/Components/Instance.cs
+++ b/src/Tgstation.Server.Host/Components/Instance.cs
@@ -392,8 +392,8 @@ namespace Tgstation.Server.Host.Components
var result = await repo.MergeOrigin(
NextProgressReporter("Merge Origin"),
- repositorySettings.CommitterName,
- repositorySettings.CommitterEmail,
+ repositorySettings.CommitterName!,
+ repositorySettings.CommitterEmail!,
true,
cancellationToken);
@@ -456,8 +456,8 @@ namespace Tgstation.Server.Host.Components
NextProgressReporter("Synchronize"),
repositorySettings.AccessUser,
repositorySettings.AccessToken,
- repositorySettings.CommitterName,
- repositorySettings.CommitterEmail,
+ repositorySettings.CommitterName!,
+ repositorySettings.CommitterEmail!,
shouldSyncTracked,
true,
cancellationToken);
diff --git a/src/Tgstation.Server.Host/Components/Repository/IRepository.cs b/src/Tgstation.Server.Host/Components/Repository/IRepository.cs
index ed858ab492..795e264609 100644
--- a/src/Tgstation.Server.Host/Components/Repository/IRepository.cs
+++ b/src/Tgstation.Server.Host/Components/Repository/IRepository.cs
@@ -5,8 +5,6 @@ using System.Threading.Tasks;
using Tgstation.Server.Api.Models;
using Tgstation.Server.Host.Jobs;
-#nullable disable
-
namespace Tgstation.Server.Host.Components.Repository
{
///
@@ -46,18 +44,18 @@ namespace Tgstation.Server.Host.Components.Repository
/// Checks out a given .
///
/// The sha or reference to checkout.
- /// The username used for fetching from submodule repositories.
- /// The password used for fetching from submodule repositories.
+ /// The optional username used for fetching from submodule repositories.
+ /// The optional password used for fetching from submodule repositories.
/// If a submodule update should be attempted after the merge.
/// The optional to report progress of the operation.
/// The for the operation.
/// A representing the running operation.
ValueTask CheckoutObject(
string committish,
- string username,
- string password,
+ string? username,
+ string? password,
bool updateSubmodules,
- JobProgressReporter progressReporter,
+ JobProgressReporter? progressReporter,
CancellationToken cancellationToken);
///
@@ -66,8 +64,8 @@ namespace Tgstation.Server.Host.Components.Repository
/// The of the pull request.
/// The name of the merge committer.
/// The e-mail of the merge committer.
- /// The username used to fetch from the origin and submodule repositories.
- /// The password used to fetch from the origin and submodule repositories.
+ /// The optional username used to fetch from the origin and submodule repositories.
+ /// The optional password used to fetch from the origin and submodule repositories.
/// If a submodule update should be attempted after the merge.
/// The to report progress of the operation.
/// The for the operation.
@@ -76,8 +74,8 @@ namespace Tgstation.Server.Host.Components.Repository
TestMergeParameters testMergeParameters,
string committerName,
string committerEmail,
- string username,
- string password,
+ string? username,
+ string? password,
bool updateSubmodules,
JobProgressReporter progressReporter,
CancellationToken cancellationToken);
@@ -86,15 +84,15 @@ namespace Tgstation.Server.Host.Components.Repository
/// Fetch commits from the origin repository.
///
/// The optional to report progress of the operation.
- /// The username to fetch from the origin repository.
- /// The password to fetch from the origin repository.
+ /// The optional username to fetch from the origin repository.
+ /// The optional password to fetch from the origin repository.
/// If any events created should be marked as part of the deployment pipeline.
/// The for the operation.
/// A representing the running operation.
ValueTask FetchOrigin(
- JobProgressReporter progressReporter,
- string username,
- string password,
+ JobProgressReporter? progressReporter,
+ string? username,
+ string? password,
bool deploymentPipeline,
CancellationToken cancellationToken);
@@ -102,16 +100,16 @@ namespace Tgstation.Server.Host.Components.Repository
/// Requires the current HEAD to be a tracked reference. Hard resets the reference to what it tracks on the origin repository.
///
/// The to report progress of the operation.
- /// The username used for fetching from submodule repositories.
- /// The password used for fetching from submodule repositories.
+ /// The optional username used for fetching from submodule repositories.
+ /// The optional password used for fetching from submodule repositories.
/// If a submodule update should be attempted after the merge.
/// If any events created should be marked as part of the deployment pipeline.
/// The for the operation.
/// A resulting in the SHA of the new HEAD.
ValueTask ResetToOrigin(
JobProgressReporter progressReporter,
- string username,
- string password,
+ string? username,
+ string? password,
bool updateSubmodules,
bool deploymentPipeline,
CancellationToken cancellationToken);
@@ -155,8 +153,8 @@ namespace Tgstation.Server.Host.Components.Repository
/// A resulting in if commits were pushed to the tracked origin reference, otherwise.
ValueTask Sychronize(
JobProgressReporter progressReporter,
- string username,
- string password,
+ string? username,
+ string? password,
string committerName,
string committerEmail,
bool synchronizeTrackedBranch,