diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-18 08:17:02 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-18 08:17:02 +0000 |
| commit | b39512ed755239198a9c294b6a45e65c05900235 (patch) | |
| tree | d234a3efade1de67c46b9e5a38ce813627726aa7 /app/helpers/commits_helper.rb | |
| parent | d31474cf3b17ece37939d20082b07f6657cc79a9 (diff) | |
| download | gitlab-ce-b39512ed755239198a9c294b6a45e65c05900235.tar.gz | |
Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42
Diffstat (limited to 'app/helpers/commits_helper.rb')
| -rw-r--r-- | app/helpers/commits_helper.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb index 33b771eef69..1920650bc93 100644 --- a/app/helpers/commits_helper.rb +++ b/app/helpers/commits_helper.rb @@ -28,7 +28,7 @@ module CommitsHelper def commit_to_html(commit, ref, project) render partial: 'projects/commits/commit', formats: :html, - locals: { + locals: { commit: commit, ref: ref, project: project @@ -137,7 +137,12 @@ module CommitsHelper def conditionally_paginate_diff_files(diffs, paginate:, page:, per:) if paginate - Kaminari.paginate_array(diffs.diff_files.to_a).page(page).per(per) + diff_files = diffs.diff_files.to_a + Gitlab::Utils::BatchLoader.clear_key([:repository_blobs, diffs.project.repository]) + + Kaminari.paginate_array(diff_files).page(page).per(per).tap do |diff_files| + diff_files.each(&:add_blobs_to_batch_loader) + end else diffs.diff_files end |