Merge pull request #626 from Cyberboss/NoDoubleDip

Prevent the same test merge PR# from being merged multiple times in one commit chain
This commit is contained in:
Jordan Brown
2018-09-12 14:45:08 -04:00
committed by GitHub
@@ -609,6 +609,10 @@ namespace Tgstation.Server.Host.Controllers
{
Octokit.PullRequest pr = null;
string errorMessage = null;
if (lastRevisionInfo.ActiveTestMerges.Any(x => x.TestMerge.Number == I.Number.Value))
throw new JobException("Cannot test merge the same PR twice in one HEAD!");
try
{
//load from cache if possible