Merge pull request #1556 from npcode/sso-github-ent

Make the Gitlab SSO Support compatible with Github Enterprise

model/gitlab.go

@@ -17,13 +17,18 @@ const (
 type GitLabUser struct {
 	Id       int64  `json:"id"`
 	Username string `json:"username"`
+	Login    string `json:"login"`
 	Email    string `json:"email"`
 	Name     string `json:"name"`
 }
 
 func UserFromGitLabUser(glu *GitLabUser) *User {
 	user := &User{}
-	user.Username = CleanUsername(glu.Username)
+	username := glu.Username
+	if username == "" {
+		username = glu.Login
+	}
+	user.Username = CleanUsername(username)
 	splitName := strings.Split(glu.Name, " ")
 	if len(splitName) == 2 {
 		user.FirstName = splitName[0]