summaryrefslogtreecommitdiffstats
path: root/model/gitlab
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2016-05-11 11:04:30 -0700
committerChristopher Speller <crspeller@gmail.com>2016-05-11 14:04:30 -0400
commit3928535456f9fcb025ed86edeb4d258f2c524150 (patch)
tree010f4bd298f23b92711affcdef81cc329c522e67 /model/gitlab
parenta574397a7256bed7738f499019f97ab468b5161d (diff)
downloadchat-3928535456f9fcb025ed86edeb4d258f2c524150.tar.gz
chat-3928535456f9fcb025ed86edeb4d258f2c524150.tar.bz2
chat-3928535456f9fcb025ed86edeb4d258f2c524150.zip
PLT-2905 fixing upgrade of SSO accounts (#2962)
* PLT-2905 fixing upgrade of SSO accounts * Fixing multiple Auths mapped to different emails
Diffstat (limited to 'model/gitlab')
-rw-r--r--model/gitlab/gitlab.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/model/gitlab/gitlab.go b/model/gitlab/gitlab.go
index d6071f99f..fc70dd93f 100644
--- a/model/gitlab/gitlab.go
+++ b/model/gitlab/gitlab.go
@@ -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