diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-01-04 10:58:47 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-01-04 10:58:47 +0000 |
| commit | 062ea80e649ae516f26db55c6e3b170523fdcd62 (patch) | |
| tree | 5110aec3e23eed05b57e6784bdf49cbf585418f6 /lib/gitlab/gitaly_client | |
| parent | ac409fb44402622dfd6abb076f7a85df4b27d39d (diff) | |
| parent | 13932b0b12c91e9ddc17e0bbf3d7afa44b5e3fb1 (diff) | |
| download | gitlab-ce-062ea80e649ae516f26db55c6e3b170523fdcd62.tar.gz | |
Merge branch 'feature/add-max-count-to-count-commits-rpc' into 'master'
Add support for max_count option to Git::Repository#count_commits
See merge request gitlab-org/gitlab-ce!16145
Diffstat (limited to 'lib/gitlab/gitaly_client')
| -rw-r--r-- | lib/gitlab/gitaly_client/commit_service.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/gitlab/gitaly_client/commit_service.rb b/lib/gitlab/gitaly_client/commit_service.rb index 8a29e8ec5b6..fed05bb6c64 100644 --- a/lib/gitlab/gitaly_client/commit_service.rb +++ b/lib/gitlab/gitaly_client/commit_service.rb @@ -130,6 +130,7 @@ module Gitlab request.after = Google::Protobuf::Timestamp.new(seconds: options[:after].to_i) if options[:after].present? request.before = Google::Protobuf::Timestamp.new(seconds: options[:before].to_i) if options[:before].present? request.path = options[:path] if options[:path].present? + request.max_count = options[:max_count] if options[:max_count].present? GitalyClient.call(@repository.storage, :commit_service, :count_commits, request, timeout: GitalyClient.medium_timeout).count end |