diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-09 12:08:20 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-09 12:08:20 +0300 |
| commit | d9f331328ab89d8423cb43ee9103f2a39b473d7f (patch) | |
| tree | 15133b6f3388df1df271a8c64b74d5ce53baa466 /app/models/concerns/timebox.rb | |
| parent | 828858774207747860f4914e523a7864b5e56ccb (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/concerns/timebox.rb')
| -rw-r--r-- | app/models/concerns/timebox.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/concerns/timebox.rb b/app/models/concerns/timebox.rb index 4c8d4b1ea59..8927e42dd97 100644 --- a/app/models/concerns/timebox.rb +++ b/app/models/concerns/timebox.rb @@ -66,7 +66,7 @@ module Timebox groups = groups.compact if groups.is_a? Array groups = [] if groups.nil? - if Feature.enabled?(:optimized_timebox_queries) + 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)) |