diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-03-29 15:16:31 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-03-30 05:20:29 -0700 |
| commit | cedbb3366bf3dd9bafe95dde366c1e28ee70c615 (patch) | |
| tree | e41816fc09a503b3d13c8037473a07b133972af8 /lib/api/branches.rb | |
| parent | 50a1e01fa8959b08df8bfc18940f9310876873b3 (diff) | |
| download | gitlab-ce-cedbb3366bf3dd9bafe95dde366c1e28ee70c615.tar.gz | |
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.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56250
Diffstat (limited to 'lib/api/branches.rb')
| -rw-r--r-- | lib/api/branches.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/branches.rb b/lib/api/branches.rb index 07f529b01bb..5c98b0ad56c 100644 --- a/lib/api/branches.rb +++ b/lib/api/branches.rb @@ -34,11 +34,11 @@ module API repository = user_project.repository branches = BranchesFinder.new(repository, declared_params(include_missing: false)).execute - branches = ::Kaminari.paginate_array(branches) + branches = paginate(::Kaminari.paginate_array(branches)) merged_branch_names = repository.merged_branch_names(branches.map(&:name)) present( - paginate(branches), + branches, with: Entities::Branch, current_user: current_user, project: user_project, |