IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

PLT-2905 fixing upgrade of SSO accounts (#2962)

Browse Source 
* PLT-2905 fixing upgrade of SSO accounts

* Fixing multiple Auths mapped to different emails
This commit is contained in:
Corey Hulen
2016-05-11 11:04:30 -07:00
committed by Christopher Speller
parent a574397a72
commit 3928535456
12 changed files with 122 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
model/gitlab/gitlab.go
View File

@@ -47,7 +47,7 @@ func userFromGitLabUser(glu *GitLabUser) *model.User {
}
strings.TrimSpace(user.Email)
user.Email = glu.Email
user.AuthData = strconv.FormatInt(glu.Id, 10)
*user.AuthData = strconv.FormatInt(glu.Id, 10)
user.AuthService = model.USER_AUTH_SERVICE_GITLAB
return user