diff options
Diffstat (limited to 'app/helpers/commits_helper.rb')
| -rw-r--r-- | app/helpers/commits_helper.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb index 6ffef1b612b..6fb6bafb4b6 100644 --- a/app/helpers/commits_helper.rb +++ b/app/helpers/commits_helper.rb @@ -134,7 +134,13 @@ module CommitsHelper def conditionally_paginate_diff_files(diffs, paginate:, page:, per:) if paginate diff_files = diffs.diff_files.to_a - Gitlab::Utils::BatchLoader.clear_key([:repository_blobs, diffs.project.repository]) + project = diffs.project + repo = project.repository + + # While Feature flag increase_diff_file_performance exists, we clear both + Gitlab::Utils::BatchLoader.clear_key([:repository_blobs, repo, Gitlab::Diff::FileCollection::MergeRequestDiffBase.max_blob_size(project)]) + Gitlab::Utils::BatchLoader.clear_key([:repository_blobs, repo, Gitlab::Git::Blob::MAX_DATA_DISPLAY_SIZE]) + Gitlab::Utils::BatchLoader.clear_key([:repository_blobs, repo]) Kaminari.paginate_array(diff_files).page(page).per(per).tap do |diff_files| diff_files.each(&:add_blobs_to_batch_loader) |