diff options
| author | Unknwon <u@gogs.io> | 2015-12-09 20:46:05 -0500 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-12-09 20:46:05 -0500 |
| commit | 9a2e43bff28ac92f180109fe900a6997614ea5a8 (patch) | |
| tree | 564dbb6fb30c153e43b0e18499d80e7d93dd0bee /models/user.go | |
| parent | bd5dc626e82e18d3e619d918e579dc130edcd1fa (diff) | |
| download | gitea-9a2e43bff28ac92f180109fe900a6997614ea5a8.tar.gz gitea-9a2e43bff28ac92f180109fe900a6997614ea5a8.zip | |
move out git module and #1573 send push hook
Diffstat (limited to 'models/user.go')
| -rw-r--r-- | models/user.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/models/user.go b/models/user.go index 885111addb..f19e33039b 100644 --- a/models/user.go +++ b/models/user.go @@ -29,7 +29,6 @@ import ( "github.com/gogits/gogs/modules/avatar" "github.com/gogits/gogs/modules/base" - oldgit "github.com/gogits/gogs/modules/git" "github.com/gogits/gogs/modules/log" "github.com/gogits/gogs/modules/setting" ) @@ -940,11 +939,11 @@ func MakeEmailPrimary(email *EmailAddress) error { // UserCommit represents a commit with validation of user. type UserCommit struct { User *User - *oldgit.Commit + *git.Commit } // ValidateCommitWithEmail chceck if author's e-mail of commit is corresponsind to a user. -func ValidateCommitWithEmail(c *oldgit.Commit) *User { +func ValidateCommitWithEmail(c *git.Commit) *User { u, err := GetUserByEmail(c.Author.Email) if err != nil { return nil @@ -961,7 +960,7 @@ func ValidateCommitsWithEmails(oldCommits *list.List) *list.List { e = oldCommits.Front() ) for e != nil { - c := e.Value.(*oldgit.Commit) + c := e.Value.(*git.Commit) if v, ok := emails[c.Author.Email]; !ok { u, _ = GetUserByEmail(c.Author.Email) |