Mirrors/gitea
0
0 Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-10-06 21:07:06 +02:00
Code Issues Activity

Merge branch 'dev' of github.com:gogits/gogs into dev

Browse Source 
Conflicts:
	models/oauth2.go
This commit is contained in:
Unknown committed 2014-04-09 14:15:09 -04:00
2 parents a773cf1d87 8683d2f857
commit 5f6bd323f5
9 files changed
+260 -24
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

models/oauth2.go
+2 -1
View File
@@ -44,5 +44,6 @@ func GetOauth2(identity string) (oa *Oauth2, err error) {
} else if oa.Uid == 0 {
return oa, ErrOauth2NotAssociatedWithUser
}
return GetUserById(oa.Uid)
oa.User, err = GetUserById(oa.Uid)
return oa, err
}