From 384c5e162d59e6d276d9bad0bd25163ee6d63c5c Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Thu, 6 Dec 2018 16:31:30 +0000 Subject: Restructure `foo ? bar : false` as `foo && bar` --- app/finders/issuable_finder.rb | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'app/finders/issuable_finder.rb') 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 -- cgit v1.2.3