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

Fixes PRs getting test merged if they were merged upstream

Browse Source
This commit is contained in:
Cyberboss
2017-12-07 10:54:24 -05:00
parent c4a312fed0
commit 930eed239c
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TGS.ControlPanel/TestMergeManager.cs
+4 -1
View File
@@ -239,7 +239,10 @@ namespace TGS.ControlPanel
var S = (string)PullRequestListBox.Items[I];
string mergedSha = null;
var splits = S.Split(' ');
if((S.Contains(" - OUTDATED: " ) || S.Contains(" - MERGED ON REMOTE: ")) && PullRequestListBox.GetItemCheckState(I) == CheckState.Indeterminate)
var mergedOnRemote = S.Contains(" - MERGED ON REMOTE: ");
if (mergedOnRemote && UpdateToRemoteRadioButton.Checked)
continue;
if ((S.Contains(" - OUTDATED: " ) || mergedOnRemote) && PullRequestListBox.GetItemCheckState(I) == CheckState.Indeterminate)
mergedSha = splits[splits.Length - 1];
var key = Convert.ToInt32((splits[0].Substring(1)));
try