diff options
| author | zeripath <art27@cantab.net> | 2019-12-15 11:06:31 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-15 11:06:31 +0000 |
| commit | 3abe17f9e088d24eff4f4e3b98a6c555db334202 (patch) | |
| tree | fdfe7f04e4cb200b7a0a3b93726a85970dc95970 /services/pull/merge.go | |
| parent | e3c3b33ea7a5a223e22688c3f0eb2d3dab9f991c (diff) | |
| download | gitea-3abe17f9e088d24eff4f4e3b98a6c555db334202.tar.gz gitea-3abe17f9e088d24eff4f4e3b98a6c555db334202.zip | |
Sign protected branches (#8993)
* Move SignMerge to PullRequest
* Add approved signing mode
* As per @guillep2k comment
Diffstat (limited to 'services/pull/merge.go')
| -rw-r--r-- | services/pull/merge.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/pull/merge.go b/services/pull/merge.go index 9b75c5ffda..8aa38bf11e 100644 --- a/services/pull/merge.go +++ b/services/pull/merge.go @@ -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", ">=") { |