cwinfo/matterbridge
4
0
Fork 0
mirror of https://github.com/cwinfo/matterbridge.git synced 2025-06-28 11:29:23 +00:00
Code Releases Activity

Sync with mattermost 3.1.0

Browse Source
This commit is contained in:
Wim
2016-06-23 20:28:05 +02:00
parent e48db67649
commit 6ec77e06ea
22 changed files with 1237 additions and 556 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
vendor/github.com/mattermost/platform/model/gitlab/gitlab.go generated vendored
View File

@ -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