Skip to content

Commit fcf0178

Browse files
committed
Fix upstream api changes to user_model User
1 parent 2ccc73d commit fcf0178

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

models/ssh_key_commit_verification.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
)
1818

1919
// ParseCommitWithSSHSignature check if signature is good against keystore.
20-
func ParseCommitWithSSHSignature(c *git.Commit, committer *User) *CommitVerification {
20+
func ParseCommitWithSSHSignature(c *git.Commit, committer *user_model.User) *CommitVerification {
2121
// Now try to associate the signature with the committer, if present
2222
if committer.ID != 0 {
2323
keys, err := ListPublicKeys(committer.ID, db.ListOptions{})
@@ -56,7 +56,7 @@ func ParseCommitWithSSHSignature(c *git.Commit, committer *User) *CommitVerifica
5656
}
5757
}
5858

59-
func verifySSHCommitVerification(sig, payload string, k *PublicKey, committer, signer *User, email string) *CommitVerification {
59+
func verifySSHCommitVerification(sig, payload string, k *PublicKey, committer, signer *user_model.User, email string) *CommitVerification {
6060
if err := sshsig.Verify(bytes.NewBuffer([]byte(payload)), []byte(sig), []byte(k.Content), "git"); err != nil {
6161
return nil
6262
}

0 commit comments

Comments
 (0)