diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-12 15:09:33 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-12 15:09:33 +0300 |
| commit | 26e44c6225a19c3ec4e7d607f92b16d42b437c80 (patch) | |
| tree | 03c97705ad836eb6a89df451c7f4216d6eb9779a /app/services/namespaces | |
| parent | 3159925155a86dfd41000c1467576927c18c8f58 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/namespaces')
| -rw-r--r-- | app/services/namespaces/in_product_marketing_emails_service.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/services/namespaces/in_product_marketing_emails_service.rb b/app/services/namespaces/in_product_marketing_emails_service.rb index 45b4619ddbe..f009f5d8538 100644 --- a/app/services/namespaces/in_product_marketing_emails_service.rb +++ b/app/services/namespaces/in_product_marketing_emails_service.rb @@ -63,7 +63,10 @@ module Namespaces .completed_actions_with_latest_in_range(completed_actions, range) .incomplete_actions(incomplete_action) - Group.joins(:onboarding_progress).merge(onboarding_progress_scope) + # Filtering out sub-groups is a temporary fix to prevent calling + # `.root_ancestor` on groups that are not root groups. + # See https://gitlab.com/groups/gitlab-org/-/epics/5594 for more information. + Group.where(parent_id: nil).joins(:onboarding_progress).merge(onboarding_progress_scope) end def users_for_group(group) |