Set the base url when migrating from Gitlab using access token or username without password (#11852) (#12104)

zeripath · gernoteger · lunny · web-flow · commit d737eaa63a22 · 2020-07-02T20:26:47.000+08:00
Backport #11852 When migrating from gitlab, set the baseUrl in NewGitlabDownloader when using an access token or username without password Fix #11851 Co-authored-by: Gernot Eger <gernot.eger@gmail.com> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
diff --git a/modules/migrations/gitlab.go b/modules/migrations/gitlab.go
@@ -90,7 +90,7 @@ func NewGitlabDownloader(baseURL, repoPath, username, password string) *GitlabDo
 	var err error
 	if username != "" {
 		if password == "" {
-			gitlabClient, err = gitlab.NewClient(username)
+			gitlabClient, err = gitlab.NewClient(username, gitlab.WithBaseURL(baseURL))
 		} else {
 			gitlabClient, err = gitlab.NewBasicAuthClient(username, password, gitlab.WithBaseURL(baseURL))
 		}

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ func NewGitlabDownloader(baseURL, repoPath, username, password string) *GitlabDo`
`90`	`90`	`var err error`
`91`	`91`	`if username != "" {`
`92`	`92`	`if password == "" {`
`93`		`- gitlabClient, err = gitlab.NewClient(username)`
	`93`	`+ gitlabClient, err = gitlab.NewClient(username, gitlab.WithBaseURL(baseURL))`
`94`	`94`	`} else {`
`95`	`95`	`gitlabClient, err = gitlab.NewBasicAuthClient(username, password, gitlab.WithBaseURL(baseURL))`
`96`	`96`	`}`