summaryrefslogtreecommitdiff
path: root/app/helpers/commits_helper.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-02-10 09:09:38 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-02-10 09:09:38 +0000
commitb6e10aaed70a798a57a40987b3aafcbb5b2a1f78 (patch)
tree91272a06b09f5bc31252f7fc02ac96b92e81bcf6 /app/helpers/commits_helper.rb
parenta4f3904124120f62c8be87142de87a0ed2b7f352 (diff)
downloadgitlab-ce-b6e10aaed70a798a57a40987b3aafcbb5b2a1f78.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/commits_helper.rb')
-rw-r--r--app/helpers/commits_helper.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb
index 2d4ace5a5bf..f5c75d62097 100644
--- a/app/helpers/commits_helper.rb
+++ b/app/helpers/commits_helper.rb
@@ -126,6 +126,14 @@ module CommitsHelper
%w(btn gpg-status-box) + Array(additional_classes)
end
+ def conditionally_paginate_diff_files(diffs, paginate:, per: Projects::CommitController::COMMIT_DIFFS_PER_PAGE)
+ if paginate && Feature.enabled?(:paginate_commit_view, @project, type: :development)
+ Kaminari.paginate_array(diffs.diff_files.to_a).page(params[:page]).per(per)
+ else
+ diffs.diff_files
+ end
+ end
+
protected
# Private: Returns a link to a person. If the person has a matching user and