summaryrefslogtreecommitdiff
path: root/app/models/concerns/timebox.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/concerns/timebox.rb')
-rw-r--r--app/models/concerns/timebox.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/app/models/concerns/timebox.rb b/app/models/concerns/timebox.rb
index 8273059b30c..fb9a8cd312d 100644
--- a/app/models/concerns/timebox.rb
+++ b/app/models/concerns/timebox.rb
@@ -72,11 +72,7 @@ module Timebox
groups = groups.compact if groups.is_a? Array
groups = [] if groups.nil?
- if Feature.enabled?(:optimized_timebox_queries, default_enabled: true)
- from_union([where(project_id: projects), where(group_id: groups)], remove_duplicates: false)
- else
- where(project_id: projects).or(where(group_id: groups))
- end
+ from_union([where(project_id: projects), where(group_id: groups)], remove_duplicates: false)
end
# A timebox is within the timeframe (start_date, end_date) if it overlaps