diff options
| -rw-r--r-- | app/finders/issuable_finder.rb | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/app/finders/issuable_finder.rb b/app/finders/issuable_finder.rb index 247f2d373f1..7bf1875912d 100644 --- a/app/finders/issuable_finder.rb +++ b/app/finders/issuable_finder.rb @@ -288,21 +288,16 @@ class IssuableFinder def use_subquery_for_search? strong_memoize(:use_subquery_for_search) do - if attempt_group_search_optimizations? + attempt_group_search_optimizations? && Feature.enabled?(:use_subquery_for_group_issues_search, default_enabled: false) - else - false - end end end def use_cte_for_search? strong_memoize(:use_cte_for_search) do - if attempt_group_search_optimizations? && !use_subquery_for_search? + attempt_group_search_optimizations? && + !use_subquery_for_search? && Feature.enabled?(:use_cte_for_group_issues_search, default_enabled: true) - else - false - end end end |