Commit f688ca47 authored by Nick Thomas's avatar Nick Thomas

Merge branch 'id-disable-branches-pagination-ff' into 'master'

Disable branches_pagination_without_count by default

See merge request gitlab-org/gitlab!63630
parents 81c7e0da 710c8332
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
%ul.content-list.all-branches %ul.content-list.all-branches
- @branches.each do |branch| - @branches.each do |branch|
= render "projects/branches/branch", branch: branch, merged: @merged_branch_names.include?(branch.name), commit_status: @branch_pipeline_statuses[branch.name], show_commit_status: @branch_pipeline_statuses.any? = render "projects/branches/branch", branch: branch, merged: @merged_branch_names.include?(branch.name), commit_status: @branch_pipeline_statuses[branch.name], show_commit_status: @branch_pipeline_statuses.any?
- if Feature.enabled?(:branches_pagination_without_count, @project, default_enabled: true) - if Feature.enabled?(:branches_pagination_without_count, @project, default_enabled: :yaml)
= render('kaminari/gitlab/without_count', previous_path: @prev_path, next_path: @next_path) = render('kaminari/gitlab/without_count', previous_path: @prev_path, next_path: @next_path)
- else - else
= paginate @branches, theme: 'gitlab' = paginate @branches, theme: 'gitlab'
......
...@@ -5,4 +5,4 @@ rollout_issue_url: ...@@ -5,4 +5,4 @@ rollout_issue_url:
milestone: '13.9' milestone: '13.9'
type: development type: development
group: group::source code group: group::source code
default_enabled: true default_enabled: false
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment