Add latest changes from gitlab-org/gitlab@master

18 files changed, 18 insertions, 18 deletions

diff --git a/app/finders/alert_management/alerts_finder.rb b/app/finders/alert_management/alerts_finder.rb
index 8e0444d324a..b4f66a38faa 100644
--- a/app/finders/alert_management/alerts_finder.rb
+++ b/app/finders/alert_management/alerts_finder.rb
@@ -67,4 +67,4 @@ module AlertManagement
   end
 end
 
-AlertManagement::AlertsFinder.prepend_if_ee('EE::AlertManagement::AlertsFinder')
+AlertManagement::AlertsFinder.prepend_mod_with('AlertManagement::AlertsFinder')
diff --git a/app/finders/alert_management/http_integrations_finder.rb b/app/finders/alert_management/http_integrations_finder.rb
index 5d4c9b6fbe3..e8e85da11b7 100644
--- a/app/finders/alert_management/http_integrations_finder.rb
+++ b/app/finders/alert_management/http_integrations_finder.rb
@@ -51,4 +51,4 @@ module AlertManagement
   end
 end
 
-::AlertManagement::HttpIntegrationsFinder.prepend_if_ee('EE::AlertManagement::HttpIntegrationsFinder')
+::AlertManagement::HttpIntegrationsFinder.prepend_mod_with('AlertManagement::HttpIntegrationsFinder')
diff --git a/app/finders/autocomplete/users_finder.rb b/app/finders/autocomplete/users_finder.rb
index ff5d9ea7d19..a9fffd3f411 100644
--- a/app/finders/autocomplete/users_finder.rb
+++ b/app/finders/autocomplete/users_finder.rb
@@ -102,4 +102,4 @@ module Autocomplete
   end
 end
 
-Autocomplete::UsersFinder.prepend_if_ee('EE::Autocomplete::UsersFinder')
+Autocomplete::UsersFinder.prepend_mod_with('Autocomplete::UsersFinder')
diff --git a/app/finders/ci/daily_build_group_report_results_finder.rb b/app/finders/ci/daily_build_group_report_results_finder.rb
index 5ac1bbd0670..33aefe29392 100644
--- a/app/finders/ci/daily_build_group_report_results_finder.rb
+++ b/app/finders/ci/daily_build_group_report_results_finder.rb
@@ -94,4 +94,4 @@ module Ci
   end
 end
 
-Ci::DailyBuildGroupReportResultsFinder.prepend_if_ee('::EE::Ci::DailyBuildGroupReportResultsFinder')
+Ci::DailyBuildGroupReportResultsFinder.prepend_mod_with('Ci::DailyBuildGroupReportResultsFinder')
diff --git a/app/finders/fork_targets_finder.rb b/app/finders/fork_targets_finder.rb
index 719c244a207..3a79b216853 100644
--- a/app/finders/fork_targets_finder.rb
+++ b/app/finders/fork_targets_finder.rb
@@ -19,4 +19,4 @@ class ForkTargetsFinder
   attr_reader :project, :user
 end
 
-ForkTargetsFinder.prepend_if_ee('EE::ForkTargetsFinder')
+ForkTargetsFinder.prepend_mod_with('ForkTargetsFinder')
diff --git a/app/finders/group_members_finder.rb b/app/finders/group_members_finder.rb
index 430ff212977..982234f7506 100644
--- a/app/finders/group_members_finder.rb
+++ b/app/finders/group_members_finder.rb
@@ -88,4 +88,4 @@ class GroupMembersFinder < UnionFinder
   end
 end
 
-GroupMembersFinder.prepend_if_ee('EE::GroupMembersFinder')
+GroupMembersFinder.prepend_mod_with('GroupMembersFinder')
diff --git a/app/finders/group_projects_finder.rb b/app/finders/group_projects_finder.rb
index dfdf821e3f0..d3c26fd845c 100644
--- a/app/finders/group_projects_finder.rb
+++ b/app/finders/group_projects_finder.rb
@@ -126,4 +126,4 @@ class GroupProjectsFinder < ProjectsFinder
   end
 end
 
-GroupProjectsFinder.prepend_if_ee('EE::GroupProjectsFinder')
+GroupProjectsFinder.prepend_mod_with('GroupProjectsFinder')
diff --git a/app/finders/issues_finder.rb b/app/finders/issues_finder.rb
index 0866040d399..eb9099fe256 100644
--- a/app/finders/issues_finder.rb
+++ b/app/finders/issues_finder.rb
@@ -117,4 +117,4 @@ class IssuesFinder < IssuableFinder
   end
 end
 
-IssuesFinder.prepend_if_ee('EE::IssuesFinder')
+IssuesFinder.prepend_mod_with('IssuesFinder')
diff --git a/app/finders/issues_finder/params.rb b/app/finders/issues_finder/params.rb
index 668d969f7c0..1de117216f8 100644
--- a/app/finders/issues_finder/params.rb
+++ b/app/finders/issues_finder/params.rb
@@ -45,4 +45,4 @@ class IssuesFinder
   end
 end
 
-IssuesFinder::Params.prepend_if_ee('EE::IssuesFinder::Params')
+IssuesFinder::Params.prepend_mod_with('IssuesFinder::Params')
diff --git a/app/finders/license_template_finder.rb b/app/finders/license_template_finder.rb
index c4cb33235af..b4235a77867 100644
--- a/app/finders/license_template_finder.rb
+++ b/app/finders/license_template_finder.rb
@@ -56,4 +56,4 @@ class LicenseTemplateFinder
   end
 end
 
-LicenseTemplateFinder.prepend_if_ee('::EE::LicenseTemplateFinder')
+LicenseTemplateFinder.prepend_mod_with('LicenseTemplateFinder')
diff --git a/app/finders/merge_requests_finder.rb b/app/finders/merge_requests_finder.rb
index 9f9e2afa7fe..19fcd91a5b8 100644
--- a/app/finders/merge_requests_finder.rb
+++ b/app/finders/merge_requests_finder.rb
@@ -220,4 +220,4 @@ class MergeRequestsFinder < IssuableFinder
   end
 end
 
-MergeRequestsFinder.prepend_if_ee('EE::MergeRequestsFinder')
+MergeRequestsFinder.prepend_mod_with('MergeRequestsFinder')
diff --git a/app/finders/namespaces/projects_finder.rb b/app/finders/namespaces/projects_finder.rb
index bac5328d077..589a9696ea6 100644
--- a/app/finders/namespaces/projects_finder.rb
+++ b/app/finders/namespaces/projects_finder.rb
@@ -60,4 +60,4 @@ module Namespaces
   end
 end
 
-Namespaces::ProjectsFinder.prepend_if_ee('::EE::Namespaces::ProjectsFinder')
+Namespaces::ProjectsFinder.prepend_mod_with('Namespaces::ProjectsFinder')
diff --git a/app/finders/notes_finder.rb b/app/finders/notes_finder.rb
index 96966001e85..42bd7a24888 100644
--- a/app/finders/notes_finder.rb
+++ b/app/finders/notes_finder.rb
@@ -183,4 +183,4 @@ class NotesFinder
   end
 end
 
-NotesFinder.prepend_if_ee('EE::NotesFinder')
+NotesFinder.prepend_mod_with('NotesFinder')
diff --git a/app/finders/projects_finder.rb b/app/finders/projects_finder.rb
index 893e89daa3c..272747a124e 100644
--- a/app/finders/projects_finder.rb
+++ b/app/finders/projects_finder.rb
@@ -247,4 +247,4 @@ class ProjectsFinder < UnionFinder
   end
 end
 
-ProjectsFinder.prepend_if_ee('::EE::ProjectsFinder')
+ProjectsFinder.prepend_mod_with('ProjectsFinder')
diff --git a/app/finders/snippets_finder.rb b/app/finders/snippets_finder.rb
index 941abb70400..81643826782 100644
--- a/app/finders/snippets_finder.rb
+++ b/app/finders/snippets_finder.rb
@@ -221,4 +221,4 @@ class SnippetsFinder < UnionFinder
   end
 end
 
-SnippetsFinder.prepend_if_ee('EE::SnippetsFinder')
+SnippetsFinder.prepend_mod_with('SnippetsFinder')
diff --git a/app/finders/template_finder.rb b/app/finders/template_finder.rb
index 2d3fc9db1f0..0f5622f2df0 100644
--- a/app/finders/template_finder.rb
+++ b/app/finders/template_finder.rb
@@ -70,4 +70,4 @@ class TemplateFinder
   end
 end
 
-TemplateFinder.prepend_if_ee('::EE::TemplateFinder')
+TemplateFinder.prepend_mod_with('TemplateFinder')
diff --git a/app/finders/todos_finder.rb b/app/finders/todos_finder.rb
index f28e1281488..e83018ed24c 100644
--- a/app/finders/todos_finder.rb
+++ b/app/finders/todos_finder.rb
@@ -215,4 +215,4 @@ class TodosFinder
   end
 end
 
-TodosFinder.prepend_if_ee('EE::TodosFinder')
+TodosFinder.prepend_mod_with('TodosFinder')
diff --git a/app/finders/users_finder.rb b/app/finders/users_finder.rb
index 5ac905e0dd4..8054ecbd502 100644
--- a/app/finders/users_finder.rb
+++ b/app/finders/users_finder.rb
@@ -143,4 +143,4 @@ class UsersFinder
   # rubocop: enable CodeReuse/ActiveRecord
 end
 
-UsersFinder.prepend_if_ee('EE::UsersFinder')
+UsersFinder.prepend_mod_with('UsersFinder')