web/forgejo
10
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Sign protected branches (#8993)

Browse source 
* Move SignMerge to PullRequest

* Add approved signing mode

* As per @guillep2k comment
This commit is contained in:
zeripath 2019-12-15 11:06:31 +00:00 • committed by GitHub
parent e3c3b33ea7
commit 3abe17f9e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 129 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

2
services/pull/merge.go
View file

@ -162,7 +162,7 @@ func Merge(pr *models.PullRequest, doer *models.User, baseGitRepo *git.Repositor
// Determine if we should sign
signArg := ""
if version.Compare(binVersion, "1.7.9", ">=") {
sign, keyID := pr.BaseRepo.SignMerge(doer, tmpBasePath, "HEAD", trackingBranch)
sign, keyID := pr.SignMerge(doer, tmpBasePath, "HEAD", trackingBranch)
if sign {
signArg = "-S" + keyID
} else if version.Compare(binVersion, "2.0.0", ">=") {