From 3564df106dabe89e33062017d893a80acd527c70 Mon Sep 17 00:00:00 2001 From: ArthurH Date: Mon, 16 May 2016 14:00:04 +0200 Subject: Fix heavy regression on GitLab for version 3.0.0 (#3000) Fix regression on GitLab --- model/gitlab/gitlab.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'model') 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 -- cgit v1.2.3-1-g7c22 From 52694f676ef5651a89e16931ace2b1d77bbb5f19 Mon Sep 17 00:00:00 2001 From: enahum Date: Mon, 16 May 2016 12:15:31 -0300 Subject: PLT-2965 Fix config sanitation (#3005) --- model/config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'model') diff --git a/model/config.go b/model/config.go index eb25948fd..9a7e3b7c5 100644 --- a/model/config.go +++ b/model/config.go @@ -615,7 +615,7 @@ func (o *Config) GetSanitizeOptions() map[string]bool { } func (o *Config) Sanitize() { - if &o.LdapSettings != nil && len(*o.LdapSettings.BindPassword) > 0 { + if o.LdapSettings.BindPassword != nil && len(*o.LdapSettings.BindPassword) > 0 { *o.LdapSettings.BindPassword = FAKE_SETTING } -- cgit v1.2.3-1-g7c22