From 0b1c2dda94b11d01fd52c9a0694e990abd2ecdef Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Thu, 30 Nov 2017 09:36:57 -0500 Subject: [PATCH] Control panel update flow doesnt announce pre-merged PRs --- TGS.ControlPanel/ControlPanel/ServerPage.cs | 2 +- TGS.ControlPanel/TestMergeManager.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/TGS.ControlPanel/ControlPanel/ServerPage.cs b/TGS.ControlPanel/ControlPanel/ServerPage.cs index 15f9dbdac0..412acb1ff3 100644 --- a/TGS.ControlPanel/ControlPanel/ServerPage.cs +++ b/TGS.ControlPanel/ControlPanel/ServerPage.cs @@ -364,7 +364,7 @@ namespace TGS.ControlPanel var results = new List(); 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)) { diff --git a/TGS.ControlPanel/TestMergeManager.cs b/TGS.ControlPanel/TestMergeManager.cs index 115151a459..bb7ec6776f 100644 --- a/TGS.ControlPanel/TestMergeManager.cs +++ b/TGS.ControlPanel/TestMergeManager.cs @@ -288,7 +288,7 @@ namespace TGS.ControlPanel errors = new List(); 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)); }