diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
commit | 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 (patch) | |
tree | 5423a1c7516cffe36384133ade12572cf709398d /app/models/concerns/timebox.rb | |
parent | e570267f2f6b326480d284e0164a6464ba4081bc (diff) |
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42
Diffstat (limited to 'app/models/concerns/timebox.rb')
-rw-r--r-- | app/models/concerns/timebox.rb | 6 |
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 |