diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-07-03 09:11:23 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-07-03 09:11:23 +0000 |
| commit | 7e84f353b9c7ef79829923bd5888af5acf0aa8b6 (patch) | |
| tree | 105319188ac17578a46d6731e73fc075093f7898 /lib | |
| parent | 122e764f9b9d0deb331d21284172c2e7bef34431 (diff) | |
| parent | 2c2422d54e4b12471dbc25dbc90cbbffe4fb1c2b (diff) | |
| download | gitlab-ce-7e84f353b9c7ef79829923bd5888af5acf0aa8b6.tar.gz | |
Merge branch 'fix-gitaly-mr-creation-limits' into 'master'
Fix MR diffs created with gitaly_diff_between enabled
Closes gitaly#1256
See merge request gitlab-org/gitlab-ce!20300
Diffstat (limited to 'lib')
| -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 c9c414e5d33..d979ba0eb14 100644 --- a/lib/gitlab/gitaly_client/commit_service.rb +++ b/lib/gitlab/gitaly_client/commit_service.rb @@ -368,7 +368,7 @@ module Gitlab def call_commit_diff(request_params, options = {}) request_params[:ignore_whitespace_change] = options.fetch(:ignore_whitespace_change, false) request_params[:enforce_limits] = options.fetch(:limits, true) - request_params[:collapse_diffs] = request_params[:enforce_limits] || !options.fetch(:expanded, true) + request_params[:collapse_diffs] = !options.fetch(:expanded, true) request_params.merge!(Gitlab::Git::DiffCollection.collection_limits(options).to_h) request = Gitaly::CommitDiffRequest.new(request_params) |