cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-30 16:39:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #72 from Cyberboss/NoCompileMessageOnTestmerge

Browse Source 
Brings update messages more inline with TGS2
This commit is contained in:
Jordan Brown
2017-06-23 11:11:56 -04:00
committed by GitHub
parent 6f4bd855ac a2d7b850bb
commit fbc8bbb2a1
4 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TGServerService/Repository.cs
+5 -1
View File
@@ -508,13 +508,17 @@ namespace TGServerService
//public api
public string MergePullRequest(int PRNumber)
{
return MergePullRequestImpl(PRNumber, false);
}
string MergePullRequestImpl(int PRNumber, bool impliedUpdate)
{
lock (RepoLock)
{
var result = LoadRepo();
if (result != null)
return result;
SendMessage(String.Format("REPO: Merging PR #{0}...", PRNumber));
SendMessage(String.Format("REPO: {2}erging PR #{0}...", PRNumber, impliedUpdate ? "Test m" : "M"));
try
{
//only supported with github