diff options
| author | George Andrinopoulos <geoandri@gmail.com> | 2017-02-05 12:30:36 +0300 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-03-08 04:56:31 +0300 |
| commit | c46f933bb7cb6eccdf648112a57872dc24ebf3ad (patch) | |
| tree | 6ee07d0695655e1bd91ef083c2c7a8cf3b2caad3 /lib | |
| parent | 473cab818aff034d072f0f6c8537a584bc5aa41c (diff) | |
Fix pagination headers for repository commits api endpoint
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/commits.rb | 5 | ||||
| -rw-r--r-- | lib/gitlab/git/repository.rb | 11 |
2 files changed, 12 insertions, 4 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 diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index 6540730ca7a..0f092d4c4ab 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -292,7 +292,6 @@ module Gitlab } options = default_options.merge(options) - options[:limit] ||= 0 options[:offset] ||= 0 actual_ref = options[:ref] || root_ref begin @@ -354,6 +353,16 @@ module Gitlab lines.map! { |c| Rugged::Commit.new(rugged, c.strip) } end + def count_commits(options) + cmd = %W(#{Gitlab.config.git.bin_path} --git-dir=#{path} rev-list) + cmd += %W(--after=#{options[:after].iso8601}) if options[:after] + cmd += %W(--before=#{options[:before].iso8601}) if options[:before] + cmd += %W(--count #{options[:ref]}) + cmd += %W(-- #{options[:path]}) if options[:path].present? + raw_output = IO.popen(cmd) {|io| io.read } + raw_output.to_i + end + def sha_from_ref(ref) rev_parse_target(ref).oid end |