From 6ec77e06eaecc9b0567e1c67e9255da448fa4b2f Mon Sep 17 00:00:00 2001 From: Wim Date: Thu, 23 Jun 2016 20:28:05 +0200 Subject: Sync with mattermost 3.1.0 --- vendor/github.com/mattermost/platform/model/gitlab/gitlab.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'vendor/github.com/mattermost/platform/model/gitlab') diff --git a/vendor/github.com/mattermost/platform/model/gitlab/gitlab.go b/vendor/github.com/mattermost/platform/model/gitlab/gitlab.go index fc70dd93..e189ee68 100644 --- a/vendor/github.com/mattermost/platform/model/gitlab/gitlab.go +++ b/vendor/github.com/mattermost/platform/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 -- cgit v1.2.3