Commit 0f78b56a authored by Scott Hampton's avatar Scott Hampton

Merge branch 'jivanvl-enable-gldropdown-branches-ff' into 'master'

Enable the gldropdown_branches feature flag

See merge request gitlab-org/gitlab!58951
parents c493eb0e 4e4a5c65
...@@ -13,7 +13,7 @@ class Projects::BranchesController < Projects::ApplicationController ...@@ -13,7 +13,7 @@ class Projects::BranchesController < Projects::ApplicationController
before_action :redirect_for_legacy_index_sort_or_search, only: [:index] before_action :redirect_for_legacy_index_sort_or_search, only: [:index]
before_action :limit_diverging_commit_counts!, only: [:diverging_commit_counts] before_action :limit_diverging_commit_counts!, only: [:diverging_commit_counts]
before_action do before_action do
push_frontend_feature_flag(:gldropdown_branches) push_frontend_feature_flag(:gldropdown_branches, default_enabled: :yaml)
end end
feature_category :source_code_management feature_category :source_code_management
......
...@@ -22,7 +22,7 @@ module BranchesHelper ...@@ -22,7 +22,7 @@ module BranchesHelper
end end
def gldropdrown_branches_enabled? def gldropdrown_branches_enabled?
Feature.enabled?(:gldropdown_branches) Feature.enabled?(:gldropdown_branches, default_enabled: :yaml)
end end
end end
......
---
title: Update search and sort from the branches page
merge_request: 58951
author:
type: changed
...@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/326549 ...@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/326549
milestone: '13.11' milestone: '13.11'
type: development type: development
group: group::continuous integration group: group::continuous integration
default_enabled: false default_enabled: true
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