From cf42cb0ae63c733f93b48a868873c8cd5a2b90bb Mon Sep 17 00:00:00 2001 From: Wenxuan Zhao Date: Wed, 16 Oct 2019 19:06:28 -0700 Subject: Allow externalID to be UUID (#8551) Signed-off-by: Wenxuan Zhao --- modules/migrations/update.go | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'modules') diff --git a/modules/migrations/update.go b/modules/migrations/update.go index df626ddd95..d1465b2baf 100644 --- a/modules/migrations/update.go +++ b/modules/migrations/update.go @@ -5,8 +5,6 @@ package migrations import ( - "strconv" - "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/structs" @@ -40,11 +38,7 @@ func updateMigrationPosterIDByGitService(tp structs.GitServiceType) error { } for _, user := range users { - externalUserID, err := strconv.ParseInt(user.ExternalID, 10, 64) - if err != nil { - log.Warn("Parse externalUser %#v 's userID failed: %v", user, err) - continue - } + externalUserID := user.ExternalID if err := models.UpdateMigrationsByType(tp, externalUserID, user.UserID); err != nil { log.Error("UpdateMigrationsByType type %s external user id %v to local user id %v failed: %v", tp.Name(), user.ExternalID, user.UserID, err) } -- cgit v1.2.3