diff options
| author | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2021-04-28 08:26:59 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2021-04-28 08:26:59 +0000 |
| commit | 2e4f6a700ce74e8f08665fa7d450cec77099016c (patch) | |
| tree | 56da6672965506b295210025da73ec1fb7faf2c6 /app/controllers/projects/branches_controller.rb | |
| parent | de9c0f52604ccec94025c9b1d6904a272c41d783 (diff) | |
| parent | 05f9b5a73c8c21cdf25a9d4ce984cc9bf21985c3 (diff) | |
| download | gitlab-ce-13-9-stable.tar.gz | |
Merge remote-tracking branch 'dev/13-9-stable' into 13-9-stable13-9-stable
Diffstat (limited to 'app/controllers/projects/branches_controller.rb')
| -rw-r--r-- | app/controllers/projects/branches_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/branches_controller.rb b/app/controllers/projects/branches_controller.rb index 6f3c96fa654..be1e932a1ab 100644 --- a/app/controllers/projects/branches_controller.rb +++ b/app/controllers/projects/branches_controller.rb @@ -185,7 +185,7 @@ class Projects::BranchesController < Projects::ApplicationController # Here we get one more branch to indicate if there are more data we're not showing limit = @overview_max_branches + 1 - if Feature.enabled?(:branch_list_keyset_pagination, project, default_enabled: true) + if Feature.enabled?(:branch_list_keyset_pagination, project, default_enabled: :yaml) @active_branches = BranchesFinder.new(@repository, { per_page: limit, sort: sort_value_recently_updated }) .execute(gitaly_pagination: true).select(&:active?) |