Merge pull request #29599 from tgstation/Cyberboss-patch-2

Testmerged [s] PRs no longer shown to non-admins
This commit is contained in:
Leo
2017-08-01 10:58:09 -03:00
committed by GitHub

View File

@@ -73,12 +73,14 @@
return "" return ""
. = header ? "The following pull requests are currently test merged:<br>" : "" . = header ? "The following pull requests are currently test merged:<br>" : ""
for(var/line in testmerge) for(var/line in testmerge)
var/details var/details
if(world.RunningService()) if(world.RunningService())
var/cm = testmerge[line]["commit"] var/cm = testmerge[line]["commit"]
details = ": '" + html_encode(testmerge[line]["title"]) + "' by " + html_encode(testmerge[line]["author"]) + " at commit " + html_encode(copytext(cm, 1, min(length(cm), 7))) details = ": '" + html_encode(testmerge[line]["title"]) + "' by " + html_encode(testmerge[line]["author"]) + " at commit " + html_encode(copytext(cm, 1, min(length(cm), 7)))
else if(has_pr_details) //tgs2 support else if(has_pr_details) //tgs2 support
details = ": '" + html_encode(testmerge[line]["title"]) + "' by " + html_encode(testmerge[line]["user"]["login"]) details = ": '" + html_encode(testmerge[line]["title"]) + "' by " + html_encode(testmerge[line]["user"]["login"])
if(details && findtext(details, "\[s\]") && (!usr || !usr.client.holder))
continue
. += "<a href=\"[config.githuburl]/pull/[line]\">#[line][details]</a><br>" . += "<a href=\"[config.githuburl]/pull/[line]\">#[line][details]</a><br>"
/client/verb/showrevinfo() /client/verb/showrevinfo()