Add latest changes from gitlab-org/gitlab@master

8 files changed, 8 insertions, 8 deletions

diff --git a/app/workers/build_finished_worker.rb b/app/workers/build_finished_worker.rb
index 6cab70405d2..a3eaacec8a2 100644
--- a/app/workers/build_finished_worker.rb
+++ b/app/workers/build_finished_worker.rb
@@ -58,4 +58,4 @@ class BuildFinishedWorker # rubocop:disable Scalability/IdempotentWorker
   end
 end
 
-BuildFinishedWorker.prepend_if_ee('EE::BuildFinishedWorker')
+BuildFinishedWorker.prepend_mod_with('BuildFinishedWorker')
diff --git a/app/workers/issuable_export_csv_worker.rb b/app/workers/issuable_export_csv_worker.rb
index 3513e5a84f1..41facab6bb9 100644
--- a/app/workers/issuable_export_csv_worker.rb
+++ b/app/workers/issuable_export_csv_worker.rb
@@ -49,4 +49,4 @@ class IssuableExportCsvWorker # rubocop:disable Scalability/IdempotentWorker
   end
 end
 
-IssuableExportCsvWorker.prepend_if_ee('::EE::IssuableExportCsvWorker')
+IssuableExportCsvWorker.prepend_mod_with('IssuableExportCsvWorker')
diff --git a/app/workers/namespaces/in_product_marketing_emails_worker.rb b/app/workers/namespaces/in_product_marketing_emails_worker.rb
index 0aab7039844..7985325d1ad 100644
--- a/app/workers/namespaces/in_product_marketing_emails_worker.rb
+++ b/app/workers/namespaces/in_product_marketing_emails_worker.rb
@@ -35,4 +35,4 @@ module Namespaces
   end
 end
 
-Namespaces::InProductMarketingEmailsWorker.prepend_if_ee('EE::Namespaces::InProductMarketingEmailsWorker')
+Namespaces::InProductMarketingEmailsWorker.prepend_mod_with('Namespaces::InProductMarketingEmailsWorker')
diff --git a/app/workers/post_receive.rb b/app/workers/post_receive.rb
index 222510c81d0..ce985492935 100644
--- a/app/workers/post_receive.rb
+++ b/app/workers/post_receive.rb
@@ -136,4 +136,4 @@ class PostReceive # rubocop:disable Scalability/IdempotentWorker
   end
 end
 
-PostReceive.prepend_if_ee('EE::PostReceive')
+PostReceive.prepend_mod_with('PostReceive')
diff --git a/app/workers/project_cache_worker.rb b/app/workers/project_cache_worker.rb
index 01e76d22975..d2796cdb697 100644
--- a/app/workers/project_cache_worker.rb
+++ b/app/workers/project_cache_worker.rb
@@ -63,4 +63,4 @@ class ProjectCacheWorker
   end
 end
 
-ProjectCacheWorker.prepend_if_ee('EE::ProjectCacheWorker')
+ProjectCacheWorker.prepend_mod_with('ProjectCacheWorker')
diff --git a/app/workers/repository_check/batch_worker.rb b/app/workers/repository_check/batch_worker.rb
index 88b40c3b4d1..a8744638d7b 100644
--- a/app/workers/repository_check/batch_worker.rb
+++ b/app/workers/repository_check/batch_worker.rb
@@ -97,4 +97,4 @@ module RepositoryCheck
   end
 end
 
-RepositoryCheck::BatchWorker.prepend_if_ee('::EE::RepositoryCheck::BatchWorker')
+RepositoryCheck::BatchWorker.prepend_mod_with('RepositoryCheck::BatchWorker')
diff --git a/app/workers/repository_check/single_repository_worker.rb b/app/workers/repository_check/single_repository_worker.rb
index 153ad087a5f..a9a8201205e 100644
--- a/app/workers/repository_check/single_repository_worker.rb
+++ b/app/workers/repository_check/single_repository_worker.rb
@@ -69,4 +69,4 @@ module RepositoryCheck
   end
 end
 
-RepositoryCheck::SingleRepositoryWorker.prepend_if_ee('::EE::RepositoryCheck::SingleRepositoryWorker')
+RepositoryCheck::SingleRepositoryWorker.prepend_mod_with('RepositoryCheck::SingleRepositoryWorker')
diff --git a/app/workers/repository_import_worker.rb b/app/workers/repository_import_worker.rb
index 90764d7374d..0f86d55df22 100644
--- a/app/workers/repository_import_worker.rb
+++ b/app/workers/repository_import_worker.rb
@@ -63,4 +63,4 @@ class RepositoryImportWorker # rubocop:disable Scalability/IdempotentWorker
   end
 end
 
-RepositoryImportWorker.prepend_if_ee('EE::RepositoryImportWorker')
+RepositoryImportWorker.prepend_mod_with('RepositoryImportWorker')