Commit cdc81e75 authored by Rajendra Kadam's avatar Rajendra Kadam Committed by Peter Leitzen

Move prepend to last line in app workers and uploaders

parent 6c39d8d1
...@@ -137,8 +137,6 @@ module ObjectStorage ...@@ -137,8 +137,6 @@ module ObjectStorage
included do |base| included do |base|
base.include(ObjectStorage) base.include(ObjectStorage)
include_if_ee('::EE::ObjectStorage::Concern') # rubocop: disable Cop/InjectEnterpriseEditionModule
after :migrate, :delete_migrated_file after :migrate, :delete_migrated_file
end end
...@@ -463,3 +461,5 @@ module ObjectStorage ...@@ -463,3 +461,5 @@ module ObjectStorage
end end
end end
end end
ObjectStorage::Concern.include_if_ee('::EE::ObjectStorage::Concern')
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
module RepositoryCheck module RepositoryCheck
class BatchWorker # rubocop:disable Scalability/IdempotentWorker class BatchWorker # rubocop:disable Scalability/IdempotentWorker
prepend_if_ee('::EE::RepositoryCheck::BatchWorker') # rubocop: disable Cop/InjectEnterpriseEditionModule
include ApplicationWorker include ApplicationWorker
include RepositoryCheckQueue include RepositoryCheckQueue
include ExclusiveLeaseGuard include ExclusiveLeaseGuard
...@@ -94,3 +92,5 @@ module RepositoryCheck ...@@ -94,3 +92,5 @@ module RepositoryCheck
end end
end end
end end
RepositoryCheck::BatchWorker.prepend_if_ee('::EE::RepositoryCheck::BatchWorker')
...@@ -5,8 +5,6 @@ module RepositoryCheck ...@@ -5,8 +5,6 @@ module RepositoryCheck
include ApplicationWorker include ApplicationWorker
include RepositoryCheckQueue include RepositoryCheckQueue
prepend_if_ee('::EE::RepositoryCheck::SingleRepositoryWorker') # rubocop: disable Cop/InjectEnterpriseEditionModule
def perform(project_id) def perform(project_id)
project = Project.find(project_id) project = Project.find(project_id)
healthy = project_healthy?(project) healthy = project_healthy?(project)
...@@ -68,3 +66,5 @@ module RepositoryCheck ...@@ -68,3 +66,5 @@ module RepositoryCheck
end end
end end
end end
RepositoryCheck::SingleRepositoryWorker.prepend_if_ee('::EE::RepositoryCheck::SingleRepositoryWorker')
---
title: Move prepend to last line in app workers and uploaders
merge_request: 29379
author: Rajendra Kadam
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment