Skip to content
Snippets Groups Projects

Fix API /project/:id/branches not returning correct merge status

Merged Stan Hu requested to merge sh-fix-project-branches-merge-status into master
All threads resolved!

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.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56250

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Stan Hu added 1 commit

    added 1 commit

    • 2675581c - Revise merged branch check to green light up to N branches

    Compare with previous version

  • Stan Hu resolved all discussions

    resolved all discussions

  • Douwe Maan approved this merge request

    approved this merge request

  • merged

  • @stanhu Thanks!

  • Douwe Maan mentioned in commit 2db4e79f

    mentioned in commit 2db4e79f

  • Douwe Maan mentioned in commit ecadff99

    mentioned in commit ecadff99

  • Automatically picked into https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/26866, will merge into 11-9-stable ready for 11.9.5.

  • GitLab Release Tools Bot removed 1 deleted label

    removed 1 deleted label

  • mentioned in merge request !26866 (merged)

  • Please register or sign in to reply
    Loading