diff options
| author | Unknown <joe2010xtmf@163.com> | 2014-04-09 14:15:09 -0400 |
|---|---|---|
| committer | Unknown <joe2010xtmf@163.com> | 2014-04-09 14:15:09 -0400 |
| commit | 5f6bd323f530410c687b17b0251a5a2ffacb755b (patch) | |
| tree | d7c96fa01262d7cf26b6b06d58d86dfd942a2014 /models/oauth2.go | |
| parent | a773cf1d876d59ab036ebf8a6843bf78da83531e (diff) | |
| parent | 8683d2f8570fedad694d0610074296a1452d3942 (diff) | |
| download | gitea-5f6bd323f530410c687b17b0251a5a2ffacb755b.tar.gz gitea-5f6bd323f530410c687b17b0251a5a2ffacb755b.zip | |
Merge branch 'dev' of github.com:gogits/gogs into dev
Conflicts:
models/oauth2.go
Diffstat (limited to 'models/oauth2.go')
| -rw-r--r-- | models/oauth2.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/models/oauth2.go b/models/oauth2.go index cde57b87b9..45728b0d51 100644 --- a/models/oauth2.go +++ b/models/oauth2.go @@ -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 } |