diff options
| author | George Andrinopoulos <geoandri@gmail.com> | 2017-02-05 11:30:36 +0200 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-03-07 22:56:31 -0300 |
| commit | c46f933bb7cb6eccdf648112a57872dc24ebf3ad (patch) | |
| tree | 6ee07d0695655e1bd91ef083c2c7a8cf3b2caad3 /lib/api | |
| parent | 473cab818aff034d072f0f6c8537a584bc5aa41c (diff) | |
| download | gitlab-ce-c46f933bb7cb6eccdf648112a57872dc24ebf3ad.tar.gz | |
Fix pagination headers for repository commits api endpoint
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/commits.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/api/commits.rb b/lib/api/commits.rb index 6205bff3bc0..330ad4e3d3b 100644 --- a/lib/api/commits.rb +++ b/lib/api/commits.rb @@ -24,7 +24,7 @@ module API end get ":id/repository/commits" do ref = params[:ref_name] || user_project.try(:default_branch) || 'master' - offset = params[:page] * params[:per_page] + offset = (params[:page] - 1) * params[:per_page] commits = user_project.repository.commits(ref, path: params[:path], @@ -33,8 +33,7 @@ module API after: params[:since], before: params[:until]) - commit_count = user_project.repository.commit_count_for_ref(ref) - paginated_commits = Kaminari.paginate_array(commits, total_count: commit_count) + paginated_commits = Kaminari.paginate_array(commits, total_count: commits.size) present paginate(paginated_commits), with: Entities::RepoCommit end |