cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-26 14:37:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Control panel update flow doesnt announce pre-merged PRs

Browse Source
This commit is contained in:
Cyberboss
2017-11-30 09:42:33 -05:00
parent 69eeff0ff1
commit 0b1c2dda94
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TGS.ControlPanel/ControlPanel/ServerPage.cs
+1 -1
View File
@@ -364,7 +364,7 @@ namespace TGS.ControlPanel
var results = new List<string>();
foreach (var I in pulls) {
retry:
await Task.Factory.StartNew(() => res = repo.MergePullRequest(I.Number, I.Sha));
await Task.Factory.StartNew(() => res = repo.MergePullRequest(I.Number, I.Sha, true));
if (res != null)
switch(MessageBox.Show(res, "Error Re-merging Pull Request", MessageBoxButtons.AbortRetryIgnore))
{
TGS.ControlPanel/TestMergeManager.cs
+1 -1
View File
@@ -288,7 +288,7 @@ namespace TGS.ControlPanel
errors = new List<string>();
foreach (var I in pulls)
{
var res = repo.MergePullRequest(I.Key, I.Value);
var res = repo.MergePullRequest(I.Key, I.Value, true);
if (res != null)
errors.Add(String.Format("Error merging PR #{0}: {1}", I, res));
}