Commit bc548d62 authored by Adam Hegyi's avatar Adam Hegyi

Remove optimized_groups_with_templates FF

This change removes the `optimized_groups_with_templates` feature flag.
The feature flag was removed earlier, however this part was missed.
parent ff29fcb0
...@@ -195,22 +195,13 @@ module EE ...@@ -195,22 +195,13 @@ module EE
def available_subgroups_with_custom_project_templates(group_id = nil) def available_subgroups_with_custom_project_templates(group_id = nil)
found_groups = GroupsWithTemplatesFinder.new(group_id).execute found_groups = GroupsWithTemplatesFinder.new(group_id).execute
if ::Feature.enabled?(:optimized_groups_with_templates_finder) GroupsFinder.new(self, min_access_level: ::Gitlab::Access::DEVELOPER)
GroupsFinder.new(self, min_access_level: ::Gitlab::Access::DEVELOPER) .execute
.execute .where(id: found_groups.select(:custom_project_templates_group_id))
.where(id: found_groups.select(:custom_project_templates_group_id)) .preload(:projects)
.preload(:projects) .joins(:projects)
.joins(:projects) .reorder(nil)
.reorder(nil) .distinct
.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
end end
def roadmap_layout 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