diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-09-07 17:02:17 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-09-07 17:02:17 +0300 |
| commit | 7f2b287f6622dd5052da369a8e83fd6707d96173 (patch) | |
| tree | d926c77b1a1e22ff0efba617d7de7fd697a16dea /lib/gitlab/gitaly_client | |
| parent | f4d3f81b954f29f5c9df16b1eeddc35b4d2b9700 (diff) | |
| parent | 965ff14b6fec206d81e2a94fceddd0eda3dfed3a (diff) | |
Merge branch 'osw-send-max-patch-bytes-to-gitaly' into 'master'
Send max_patch_bytes to Gitaly via Gitaly::CommitDiffRequest
Closes #50635
See merge request gitlab-org/gitlab-ce!21575
Diffstat (limited to 'lib/gitlab/gitaly_client')
| -rw-r--r-- | lib/gitlab/gitaly_client/commit_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/gitaly_client/commit_service.rb b/lib/gitlab/gitaly_client/commit_service.rb index 6a97cd8ed17..aa5b4f94090 100644 --- a/lib/gitlab/gitaly_client/commit_service.rb +++ b/lib/gitlab/gitaly_client/commit_service.rb @@ -369,7 +369,7 @@ module Gitlab request_params[:ignore_whitespace_change] = options.fetch(:ignore_whitespace_change, false) request_params[:enforce_limits] = options.fetch(:limits, true) request_params[:collapse_diffs] = !options.fetch(:expanded, true) - request_params.merge!(Gitlab::Git::DiffCollection.collection_limits(options).to_h) + request_params.merge!(Gitlab::Git::DiffCollection.limits(options).to_h) request = Gitaly::CommitDiffRequest.new(request_params) response = GitalyClient.call(@repository.storage, :diff_service, :commit_diff, request, timeout: GitalyClient.medium_timeout) |