diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-23 12:14:52 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-23 12:14:52 +0300 |
| commit | 347bf09d6ecf4871da234c06ca8ee541e27b5105 (patch) | |
| tree | 2ad6943e0c681c22acc8850d1debc6a983b0e006 /app/helpers/commits_helper.rb | |
| parent | 0a51be0866d33273070f535257626a9eb2e10700 (diff) | |
Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc20210223090520
Diffstat (limited to 'app/helpers/commits_helper.rb')
| -rw-r--r-- | app/helpers/commits_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb index f5c75d62097..2f5bfc181cb 100644 --- a/app/helpers/commits_helper.rb +++ b/app/helpers/commits_helper.rb @@ -105,7 +105,7 @@ module CommitsHelper tooltip = _("Browse Directory") end - link_to url, class: "btn gl-button btn-default has-tooltip", title: tooltip, data: { container: "body" } do + link_to url, class: "btn gl-button btn-default btn-icon has-tooltip", title: tooltip, data: { container: "body" } do sprite_icon('folder-open') end end @@ -127,7 +127,7 @@ module CommitsHelper 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) + if paginate Kaminari.paginate_array(diffs.diff_files.to_a).page(params[:page]).per(per) else diffs.diff_files |