finn/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Conflicts:
	models/oauth2.go
This commit is contained in:
Unknown 2014-04-09 14:15:09 -04:00
commit 5f6bd323f5
9 changed files with 260 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

3
models/oauth2.go
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
}