From bc548d623d032beafe58800a9001032e06a230f0 Mon Sep 17 00:00:00 2001
From: Adam Hegyi <ahegyi@gitlab.com>
Date: Fri, 25 Sep 2020 09:32:39 +0200
Subject: [PATCH] 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.
---
ee/app/models/ee/user.rb | 23 ++++++-------------
...optimized_groups_with_templates_finder.yml | 7 ------
2 files changed, 7 insertions(+), 23 deletions(-)
delete mode 100644 ee/config/feature_flags/development/optimized_groups_with_templates_finder.yml
diff --git a/ee/app/models/ee/user.rb b/ee/app/models/ee/user.rb
index 8bc3a37fd09..82fc137b5bb 100644
--- a/ee/app/models/ee/user.rb
+++ b/ee/app/models/ee/user.rb
@@ -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
diff --git a/ee/config/feature_flags/development/optimized_groups_with_templates_finder.yml b/ee/config/feature_flags/development/optimized_groups_with_templates_finder.yml
deleted file mode 100644
index 145257fdac9..00000000000
--- a/ee/config/feature_flags/development/optimized_groups_with_templates_finder.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-name: optimized_groups_with_templates_finder
-introduced_by_url:
-rollout_issue_url:
-group:
-type: development
-default_enabled: false
--
2.30.9