zeripath
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
4 additions and
4 deletions
-
models/pull_sign.go
-
models/repo_sign.go
|
|
@ -43,7 +43,7 @@ func (pr *PullRequest) SignMerge(u *User, tmpBasePath, baseCommit, headCommit st |
|
|
|
} |
|
|
|
case twofa: |
|
|
|
twofaModel, err := GetTwoFactorByUID(u.ID) |
|
|
|
if err != nil { |
|
|
|
if err != nil && !IsErrTwoFactorNotEnrolled(err) { |
|
|
|
return false, "", err |
|
|
|
} |
|
|
|
if twofaModel == nil { |
|
|
|
|
|
@ -119,7 +119,7 @@ func SignInitialCommit(repoPath string, u *User) (bool, string, error) { |
|
|
|
} |
|
|
|
case twofa: |
|
|
|
twofaModel, err := GetTwoFactorByUID(u.ID) |
|
|
|
if err != nil { |
|
|
|
if err != nil && !IsErrTwoFactorNotEnrolled(err) { |
|
|
|
return false, "", err |
|
|
|
} |
|
|
|
if twofaModel == nil { |
|
|
@ -154,7 +154,7 @@ func (repo *Repository) SignWikiCommit(u *User) (bool, string, error) { |
|
|
|
} |
|
|
|
case twofa: |
|
|
|
twofaModel, err := GetTwoFactorByUID(u.ID) |
|
|
|
if err != nil { |
|
|
|
if err != nil && !IsErrTwoFactorNotEnrolled(err) { |
|
|
|
return false, "", err |
|
|
|
} |
|
|
|
if twofaModel == nil { |
|
|
@ -206,7 +206,7 @@ func (repo *Repository) SignCRUDAction(u *User, tmpBasePath, parentCommit string |
|
|
|
} |
|
|
|
case twofa: |
|
|
|
twofaModel, err := GetTwoFactorByUID(u.ID) |
|
|
|
if err != nil { |
|
|
|
if err != nil && !IsErrTwoFactorNotEnrolled(err) { |
|
|
|
return false, "", err |
|
|
|
} |
|
|
|
if twofaModel == nil { |
|
|
|