diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-27 11:58:06 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-27 11:58:35 +0300 |
| commit | 9044dc3c4f83c5d669f158b5a4367c645caa782e (patch) | |
| tree | fac36be0de9fc79991034547f7fbe67f8d2abcd7 /lib | |
| parent | ecec480cbe10cc9740d4b83147aec3bbd533ef40 (diff) | |
Add latest changes from gitlab-org/security/gitlab@13-10-stable-ee
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/pagination/gitaly_keyset_pager.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/pagination/gitaly_keyset_pager.rb b/lib/gitlab/pagination/gitaly_keyset_pager.rb index 1350168967e..b05891066ac 100644 --- a/lib/gitlab/pagination/gitaly_keyset_pager.rb +++ b/lib/gitlab/pagination/gitaly_keyset_pager.rb @@ -26,11 +26,11 @@ module Gitlab private def keyset_pagination_enabled? - Feature.enabled?(:branch_list_keyset_pagination, project, default_enabled: true) && params[:pagination] == 'keyset' + Feature.enabled?(:branch_list_keyset_pagination, project, default_enabled: :yaml) && params[:pagination] == 'keyset' end def paginate_first_page? - Feature.enabled?(:branch_list_keyset_pagination, project, default_enabled: true) && (params[:page].blank? || params[:page].to_i == 1) + Feature.enabled?(:branch_list_keyset_pagination, project, default_enabled: :yaml) && (params[:page].blank? || params[:page].to_i == 1) end def paginate_via_gitaly(finder) |