Merge branch 'app-uploaders-workers' into 'master'

Move prepend to last line in app workers and uploaders

See merge request gitlab-org/gitlab!29379

app/uploaders/object_storage.rb

@@ -137,8 +137,6 @@ module ObjectStorage
     included do |base|
       base.include(ObjectStorage)
 
-      include_if_ee('::EE::ObjectStorage::Concern') # rubocop: disable Cop/InjectEnterpriseEditionModule
-
       after :migrate, :delete_migrated_file
     end
 
@@ -463,3 +461,5 @@ module ObjectStorage
     end
   end
 end
+
+ObjectStorage::Concern.include_if_ee('::EE::ObjectStorage::Concern')

app/workers/repository_check/batch_worker.rb

@@ -2,8 +2,6 @@
 
 module RepositoryCheck
   class BatchWorker # rubocop:disable Scalability/IdempotentWorker
-    prepend_if_ee('::EE::RepositoryCheck::BatchWorker') # rubocop: disable Cop/InjectEnterpriseEditionModule
-
     include ApplicationWorker
     include RepositoryCheckQueue
     include ExclusiveLeaseGuard
@@ -94,3 +92,5 @@ module RepositoryCheck
     end
   end
 end
+
+RepositoryCheck::BatchWorker.prepend_if_ee('::EE::RepositoryCheck::BatchWorker')

app/workers/repository_check/single_repository_worker.rb

@@ -5,8 +5,6 @@ module RepositoryCheck
     include ApplicationWorker
     include RepositoryCheckQueue
 
-    prepend_if_ee('::EE::RepositoryCheck::SingleRepositoryWorker') # rubocop: disable Cop/InjectEnterpriseEditionModule
-
     def perform(project_id)
       project = Project.find(project_id)
       healthy = project_healthy?(project)
@@ -68,3 +66,5 @@ module RepositoryCheck
     end
   end
 end
+
+RepositoryCheck::SingleRepositoryWorker.prepend_if_ee('::EE::RepositoryCheck::SingleRepositoryWorker')

changelogs/unreleased/app-uploaders-workers.yml

+---
+title: Move prepend to last line in app workers and uploaders
+merge_request: 29379
+author: Rajendra Kadam
+type: fixed