improve code

Author: lunny

docs/content/doc/advanced/config-cheat-sheet.zh-cn.md

@@ -200,7 +200,7 @@ menu:
 
 ### Cron - Update Migration Poster ID (`cron.update_migration_post_id`)
 
-- `SCHEDULE`: **@every 24h** : 每次统计的间隔时间。此任务总是在启动时自动进行。
+- `SCHEDULE`: **@every 24h** : 每次同步的间隔时间。此任务总是在启动时自动进行。
 
 ## Git (`git`)
 

models/external_login_user.go

@@ -14,11 +14,11 @@ import (
 
 // ExternalLoginUser makes the connecting between some existing user and additional external login sources
 type ExternalLoginUser struct {
-	ExternalID        string                 `xorm:"VARCHAR(50) pk NOT NULL"`
+	ExternalID        string                 `xorm:"pk NOT NULL"`
 	UserID            int64                  `xorm:"INDEX NOT NULL"`
 	LoginSourceID     int64                  `xorm:"pk NOT NULL"`
 	RawData           map[string]interface{} `xorm:"TEXT"`
-	Provider          string                 `xorm:"index"`
+	Provider          string                 `xorm:"index VARCHAR(25)"`
 	Email             string
 	Name              string
 	FirstName         string

models/migrations/v99.go

@@ -26,8 +26,29 @@ func addTaskTable(x *xorm.Engine) error {
 		Created        timeutil.TimeStamp `xorm:"created"`
 	}
 
+<<<<<<< HEAD
 	type Repository struct {
 		Status int `xorm:"NOT NULL DEFAULT 0"`
+=======
+	type ExternalLoginUser struct {
+		ExternalID        string                 `xorm:"pk NOT NULL"`
+		UserID            int64                  `xorm:"INDEX NOT NULL"`
+		LoginSourceID     int64                  `xorm:"pk NOT NULL"`
+		RawData           map[string]interface{} `xorm:"TEXT"`
+		Provider          string                 `xorm:"index VARCHAR(25)"`
+		Email             string
+		Name              string
+		FirstName         string
+		LastName          string
+		NickName          string
+		Description       string
+		AvatarURL         string
+		Location          string
+		AccessToken       string
+		AccessTokenSecret string
+		RefreshToken      string
+		ExpiresAt         time.Time
+>>>>>>> improve code
 	}
 
 	return x.Sync2(new(Task), new(Repository))

services/externalaccount/user.go

@@ -1,3 +1,7 @@
+// Copyright 2019 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
 package externalaccount
 
 import (