Fix API /project/:id/branches not returning correct merge status
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24034 introduced a regression where only the first 20 branches were used to determine whether a branch has been merged because the pagination was applied incorrectly. Requesting the second page of branches via the API would always have the wrong merge status. We fix this by properly paginating the branches before requesting their merge status.
Merge request reports
Activity
changed milestone to %11.10
added Create [DEPRECATED] api regression:11.7 + 1 deleted label
2 Warnings 2675581c: This commit’s subject line is acceptable, but please try to reduce it to 50 characters. cedbb336: This commit’s subject line is acceptable, but please try to reduce it to 50 characters. Reviewer roulette
Changes that require review have been detected! A merge request is normally reviewed by both a reviewer and a maintainer in its primary category (e.g. frontend or backend), and by a maintainer in all other categories.
To spread load more evenly across eligible reviewers, Danger has randomly picked a candidate for each review slot. Feel free to override this selection if you think someone else would be better-suited, or the chosen person is unavailable.
Once you've decided who will review this merge request, mention them as you normally would! Danger does not (yet?) automatically notify them for you.
Category Reviewer Maintainer backend Mayra Cabrera ( @mayra-cabrera
)Grzegorz Bizon ( @grzesiek
)Generated by
Danger Edited by 🤖 GitLab Bot 🤖Build failure will be fixed by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/26787/diffs.
added 24 commits
-
d8d5b997...50a1e01f - 23 commits from branch
master
- cedbb336 - Fix API /project/:id/branches not returning correct merge status
-
d8d5b997...50a1e01f - 23 commits from branch
- Resolved by Stan Hu
added 1 commit
- 2675581c - Revise merged branch check to green light up to N branches
added regression typebug labels
@stanhu Thanks!
mentioned in commit 2db4e79f
mentioned in commit ecadff99
Automatically picked into https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/26866, will merge into
11-9-stable
ready for11.9.5
.mentioned in merge request !26866 (merged)
mentioned in issue gitlab-org/release/tasks#731 (closed)
added devopscreate label