summaryrefslogtreecommitdiffstats
path: root/services/asymkey/sign.go
diff options
context:
space:
mode:
Diffstat (limited to 'services/asymkey/sign.go')
-rw-r--r--services/asymkey/sign.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/services/asymkey/sign.go b/services/asymkey/sign.go
index 2431146f97..0f74cd4b2a 100644
--- a/services/asymkey/sign.go
+++ b/services/asymkey/sign.go
@@ -13,6 +13,7 @@ import (
asymkey_model "code.gitea.io/gitea/models/asymkey"
"code.gitea.io/gitea/models/auth"
"code.gitea.io/gitea/models/db"
+ git_model "code.gitea.io/gitea/models/git"
user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log"
@@ -310,14 +311,14 @@ Loop:
return false, "", nil, &ErrWontSign{twofa}
}
case approved:
- protectedBranch, err := models.GetProtectedBranchBy(ctx, repo.ID, pr.BaseBranch)
+ protectedBranch, err := git_model.GetProtectedBranchBy(ctx, repo.ID, pr.BaseBranch)
if err != nil {
return false, "", nil, err
}
if protectedBranch == nil {
return false, "", nil, &ErrWontSign{approved}
}
- if protectedBranch.GetGrantedApprovalsCount(ctx, pr) < 1 {
+ if models.GetGrantedApprovalsCount(ctx, protectedBranch, pr) < 1 {
return false, "", nil, &ErrWontSign{approved}
}
case baseSigned: