Skip to content

Fix merge base commit for fast-forwarded GitLab PRs #27825

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lunny merged 2 commits into from
Oct 29, 2023
Merged

Fix merge base commit for fast-forwarded GitLab PRs #27825

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a3499d
Fix merge base commit for fast-forwarded GitLab PRs
invliD Oct 29, 2023
61d9641
Merge branch 'main' into sb/base-sha
GiteaBot Oct 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion services/migrations/gitlab.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,11 +528,13 @@ func (g *GitlabDownloader) GetPullRequests(page, perPage int) ([]*base.PullReque
perPage = g.maxPerPage
}

view := "simple"
opt := &gitlab.ListProjectMergeRequestsOptions{
ListOptions: gitlab.ListOptions{
PerPage: perPage,
Page: page,
},
View: &view,
}

allPRs := make([]*base.PullRequest, 0, perPage)
Expand All @@ -541,7 +543,13 @@ func (g *GitlabDownloader) GetPullRequests(page, perPage int) ([]*base.PullReque
if err != nil {
return nil, false, fmt.Errorf("error while listing merge requests: %w", err)
}
for _, pr := range prs {
for _, simplePR := range prs {
// Load merge request again by itself, as not all fields are populated in the ListProjectMergeRequests endpoint.
// See https://gitlab.com/gitlab-org/gitlab/-/issues/29620
pr, _, err := g.client.MergeRequests.GetMergeRequest(g.repoID, simplePR.IID, nil)
if err != nil {
return nil, false, fmt.Errorf("error while loading merge request: %w", err)
}

labels := make([]*base.Label, 0, len(pr.Labels))
for _, l := range pr.Labels {
Expand Down