Add latest changes from gitlab-org/gitlab@master

3 files changed, 6 insertions, 6 deletions

diff --git a/app/finders/license_template_finder.rb b/app/finders/license_template_finder.rb
index 1db175e1308..4d68b963dc3 100644
--- a/app/finders/license_template_finder.rb
+++ b/app/finders/license_template_finder.rb
@@ -13,8 +13,6 @@
 class LicenseTemplateFinder
   include Gitlab::Utils::StrongMemoize
 
-  prepend_if_ee('::EE::LicenseTemplateFinder') # rubocop: disable Cop/InjectEnterpriseEditionModule
-
   attr_reader :project, :params
 
   def initialize(project, params = {})
@@ -52,3 +50,5 @@ class LicenseTemplateFinder
     params.fetch(:popular, nil)
   end
 end
+
+LicenseTemplateFinder.prepend_if_ee('::EE::LicenseTemplateFinder')
diff --git a/app/finders/projects_finder.rb b/app/finders/projects_finder.rb
index 23648e0f494..3a84600b09f 100644
--- a/app/finders/projects_finder.rb
+++ b/app/finders/projects_finder.rb
@@ -27,8 +27,6 @@
 class ProjectsFinder < UnionFinder
   include CustomAttributesFilter
 
-  prepend_if_ee('::EE::ProjectsFinder') # rubocop: disable Cop/InjectEnterpriseEditionModule
-
   attr_accessor :params
   attr_reader :current_user, :project_ids_relation
 
@@ -225,3 +223,5 @@ class ProjectsFinder < UnionFinder
     { min_access_level: params[:min_access_level] }
   end
 end
+
+ProjectsFinder.prepend_if_ee('::EE::ProjectsFinder')
diff --git a/app/finders/template_finder.rb b/app/finders/template_finder.rb
index dfea3d427c2..78c8392f1cd 100644
--- a/app/finders/template_finder.rb
+++ b/app/finders/template_finder.rb
@@ -3,8 +3,6 @@
 class TemplateFinder
   include Gitlab::Utils::StrongMemoize
 
-  prepend_if_ee('::EE::TemplateFinder') # rubocop: disable Cop/InjectEnterpriseEditionModule
-
   VENDORED_TEMPLATES = HashWithIndifferentAccess.new(
     dockerfiles: ::Gitlab::Template::DockerfileTemplate,
     gitignores: ::Gitlab::Template::GitignoreTemplate,
@@ -42,3 +40,5 @@ class TemplateFinder
     end
   end
 end
+
+TemplateFinder.prepend_if_ee('::EE::TemplateFinder')