summaryrefslogtreecommitdiffstats
path: root/model
diff options
context:
space:
mode:
authorArthurH <arthur.halet@orange.com>2016-05-16 14:00:04 +0200
committerChristopher Speller <crspeller@gmail.com>2016-05-16 08:00:44 -0400
commit3564df106dabe89e33062017d893a80acd527c70 (patch)
treec6241e6b51286d171e9f308a8c770edb8f8960df /model
parent9d94869cc6a0fb9f051879437c104ccd76094380 (diff)
downloadchat-3564df106dabe89e33062017d893a80acd527c70.tar.gz
chat-3564df106dabe89e33062017d893a80acd527c70.tar.bz2
chat-3564df106dabe89e33062017d893a80acd527c70.zip
Fix heavy regression on GitLab for version 3.0.0 (#3000)
Fix regression on GitLab
Diffstat (limited to 'model')
-rw-r--r--model/gitlab/gitlab.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/model/gitlab/gitlab.go b/model/gitlab/gitlab.go
index fc70dd93f..e189ee68d 100644
--- a/model/gitlab/gitlab.go
+++ b/model/gitlab/gitlab.go
@@ -47,7 +47,8 @@ func userFromGitLabUser(glu *GitLabUser) *model.User {
}
strings.TrimSpace(user.Email)
user.Email = glu.Email
- *user.AuthData = strconv.FormatInt(glu.Id, 10)
+ userId := strconv.FormatInt(glu.Id, 10)
+ user.AuthData = &userId
user.AuthService = model.USER_AUTH_SERVICE_GITLAB
return user