diff options
Diffstat (limited to 'lib/gitlab/diff/file_collection/merge_request_diff_base.rb')
-rw-r--r-- | lib/gitlab/diff/file_collection/merge_request_diff_base.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/gitlab/diff/file_collection/merge_request_diff_base.rb b/lib/gitlab/diff/file_collection/merge_request_diff_base.rb index d54e1aad19a..341572f9c94 100644 --- a/lib/gitlab/diff/file_collection/merge_request_diff_base.rb +++ b/lib/gitlab/diff/file_collection/merge_request_diff_base.rb @@ -11,7 +11,7 @@ module Gitlab super(merge_request_diff, project: merge_request_diff.project, - diff_options: diff_options, + diff_options: merged_diff_options(diff_options), diff_refs: merge_request_diff.diff_refs, fallback_diff_refs: merge_request_diff.fallback_diff_refs) end @@ -64,6 +64,11 @@ module Gitlab diff_stats_cache.read || super end end + + def merged_diff_options(diff_options) + max_diff_options = ::Commit.max_diff_options(project: @merge_request_diff.project) + diff_options.present? ? diff_options.merge(max_diff_options) : max_diff_options + end end end end |