summaryrefslogtreecommitdiffstats
path: root/services/asymkey
diff options
context:
space:
mode:
Diffstat (limited to 'services/asymkey')
-rw-r--r--services/asymkey/sign.go2
-rw-r--r--services/asymkey/ssh_key.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/services/asymkey/sign.go b/services/asymkey/sign.go
index 6b17c017fc..2431146f97 100644
--- a/services/asymkey/sign.go
+++ b/services/asymkey/sign.go
@@ -310,7 +310,7 @@ Loop:
return false, "", nil, &ErrWontSign{twofa}
}
case approved:
- protectedBranch, err := models.GetProtectedBranchBy(repo.ID, pr.BaseBranch)
+ protectedBranch, err := models.GetProtectedBranchBy(ctx, repo.ID, pr.BaseBranch)
if err != nil {
return false, "", nil, err
}
diff --git a/services/asymkey/ssh_key.go b/services/asymkey/ssh_key.go
index 1f6b93eb24..143c807a10 100644
--- a/services/asymkey/ssh_key.go
+++ b/services/asymkey/ssh_key.go
@@ -42,7 +42,7 @@ func DeletePublicKey(doer *user_model.User, id int64) (err error) {
committer.Close()
if key.Type == asymkey_model.KeyTypePrincipal {
- return asymkey_model.RewriteAllPrincipalKeys()
+ return asymkey_model.RewriteAllPrincipalKeys(db.DefaultContext)
}
return asymkey_model.RewriteAllPublicKeys()