Commit 95792ac6 authored by Alper Akgun's avatar Alper Akgun

Merge branch 'remote-optimized_groups_with_templates_finder-ff' into 'master'

Remove optimized_groups_with_templates FF

See merge request gitlab-org/gitlab!43381
parents e8ea70d8 bc548d62
......@@ -195,22 +195,13 @@ module EE
def available_subgroups_with_custom_project_templates(group_id = nil)
found_groups = GroupsWithTemplatesFinder.new(group_id).execute
if ::Feature.enabled?(:optimized_groups_with_templates_finder)
GroupsFinder.new(self, min_access_level: ::Gitlab::Access::DEVELOPER)
.execute
.where(id: found_groups.select(:custom_project_templates_group_id))
.preload(:projects)
.joins(:projects)
.reorder(nil)
.distinct
else
GroupsFinder.new(self, min_access_level: ::Gitlab::Access::DEVELOPER)
.execute
.where(id: found_groups.select(:custom_project_templates_group_id))
.includes(:projects)
.reorder(nil)
.distinct
end
GroupsFinder.new(self, min_access_level: ::Gitlab::Access::DEVELOPER)
.execute
.where(id: found_groups.select(:custom_project_templates_group_id))
.preload(:projects)
.joins(:projects)
.reorder(nil)
.distinct
end
def roadmap_layout
......
---
name: optimized_groups_with_templates_finder
introduced_by_url:
rollout_issue_url:
group:
type: development
default_enabled: false
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment