mirror/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2024-12-11 14:19:19 +08:00
Code Packages Projects Releases Wiki Activity

finaly fix gitlab migration with subdir 2.0 (#13646) (#13678)

Browse Source 
* final fix 2.0?

* ignore Approvals for pulls if not found

* CI.restart()

Co-authored-by: Lauris BH <lauris@nix.lv>

Co-authored-by: Lauris BH <lauris@nix.lv>
This commit is contained in:
6543 2020-11-23 17:40:58 +01:00 committed by GitHub
parent 33431fcbd3
commit 4c9d00cf78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/migrations/gitlab.go
View File

@ -92,7 +92,7 @@ func NewGitlabDownloader(ctx context.Context, baseURL, repoPath, username, passw
pathParts := strings.Split(strings.Trim(repoPath, "/"), "/") pathParts := strings.Split(strings.Trim(repoPath, "/"), "/")
var resp *gitlab.Response var resp *gitlab.Response
u, _ := url.Parse(baseURL) u, _ := url.Parse(baseURL)
for len(pathParts) > 2 { for len(pathParts) >= 2 {
_, resp, err = gitlabClient.Version.GetVersion() _, resp, err = gitlabClient.Version.GetVersion()
if err == nil || resp != nil && resp.StatusCode == 401 { if err == nil || resp != nil && resp.StatusCode == 401 {
err = nil // if no authentication given, this still should work err = nil // if no authentication given, this still should work
@ -609,8 +609,12 @@ func (g *GitlabDownloader) GetPullRequests(page, perPage int) ([]*base.PullReque
// GetReviews returns pull requests review // GetReviews returns pull requests review
func (g *GitlabDownloader) GetReviews(pullRequestNumber int64) ([]*base.Review, error) { func (g *GitlabDownloader) GetReviews(pullRequestNumber int64) ([]*base.Review, error) {
state, _, err := g.client.MergeRequestApprovals.GetApprovalState(g.repoID, int(pullRequestNumber), gitlab.WithContext(g.ctx)) state, resp, err := g.client.MergeRequestApprovals.GetApprovalState(g.repoID, int(pullRequestNumber), gitlab.WithContext(g.ctx))
if err != nil { if err != nil {
if resp != nil && resp.StatusCode == 404 {
log.Error(fmt.Sprintf("GitlabDownloader: while migrating a error occurred: '%s'", err.Error()))
return []*base.Review{}, nil
}
return nil, err return nil, err
} }