diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-24 09:07:44 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-24 09:07:44 +0300 |
commit | 4dcdd5bebb55bd5522ec180070d4d265e00943b5 (patch) | |
tree | 33760c353dd9dc97d0e5a64b107579b89d9110ea /lib/gitlab/diff/file_collection/merge_request_diff_base.rb | |
parent | 3f29b140ab13fd23ed35e759fd2bb6f41ba788ac (diff) |
Add latest changes from gitlab-org/gitlab@master
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 | 8 |
1 files changed, 8 insertions, 0 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 801c1967e0a..9d2fd5e44ee 100644 --- a/lib/gitlab/diff/file_collection/merge_request_diff_base.rb +++ b/lib/gitlab/diff/file_collection/merge_request_diff_base.rb @@ -49,6 +49,14 @@ module Gitlab diff_stats_cache.clear end + override :max_blob_size + def self.max_blob_size(project) + return unless Feature.enabled?(:increase_diff_file_performance, project) + + [Gitlab::Git::Diff.patch_hard_limit_bytes, + Gitlab.config.extra['maximum_text_highlight_size_kilobytes']].max + end + private def highlight_cache |