diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-20 00:13:17 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-20 00:13:17 +0300 |
| commit | 9adb0b9ffb2d4a552f8c6f32d16fe863cc2975b0 (patch) | |
| tree | a8efe8a32f0ead261f8dc0c7f87c22283fda578f /app/controllers | |
| parent | 87ce80bead0b20a30641785626c3dededada40d9 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/concerns/issuable_collections.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/concerns/issuable_collections.rb b/app/controllers/concerns/issuable_collections.rb index 0fe31d74ae8..5479154f667 100644 --- a/app/controllers/concerns/issuable_collections.rb +++ b/app/controllers/concerns/issuable_collections.rb @@ -23,7 +23,7 @@ module IssuableCollections end def set_pagination - row_count = finder.row_count + row_count = request.format.atom? ? -1 : finder.row_count @issuables = @issuables.page(params[:page]) @issuables = per_page_for_relative_position if params[:sort] == 'relative_position' |