diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-11 21:10:21 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-11 21:10:21 +0000 |
| commit | 0ae8428c8e77d5d7e098827be688b1f146321af1 (patch) | |
| tree | cfc80aac796be0dd42ce32a1bd79c8327071993d /app/services | |
| parent | f020d5dc9bf42fe27b1451af34e7ab3a0c38d344 (diff) | |
| download | gitlab-ce-0ae8428c8e77d5d7e098827be688b1f146321af1.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services')
160 files changed, 160 insertions, 160 deletions
diff --git a/app/services/alert_management/http_integrations/create_service.rb b/app/services/alert_management/http_integrations/create_service.rb index e7f1084ce5c..1abe0548c45 100644 --- a/app/services/alert_management/http_integrations/create_service.rb +++ b/app/services/alert_management/http_integrations/create_service.rb @@ -66,4 +66,4 @@ module AlertManagement end end -::AlertManagement::HttpIntegrations::CreateService.prepend_if_ee('::EE::AlertManagement::HttpIntegrations::CreateService') +::AlertManagement::HttpIntegrations::CreateService.prepend_mod_with('AlertManagement::HttpIntegrations::CreateService') diff --git a/app/services/alert_management/http_integrations/update_service.rb b/app/services/alert_management/http_integrations/update_service.rb index af079f670b8..8662f966a2e 100644 --- a/app/services/alert_management/http_integrations/update_service.rb +++ b/app/services/alert_management/http_integrations/update_service.rb @@ -56,4 +56,4 @@ module AlertManagement end end -::AlertManagement::HttpIntegrations::UpdateService.prepend_if_ee('::EE::AlertManagement::HttpIntegrations::UpdateService') +::AlertManagement::HttpIntegrations::UpdateService.prepend_mod_with('AlertManagement::HttpIntegrations::UpdateService') diff --git a/app/services/application_settings/update_service.rb b/app/services/application_settings/update_service.rb index 7792b811b4e..7728982779e 100644 --- a/app/services/application_settings/update_service.rb +++ b/app/services/application_settings/update_service.rb @@ -120,4 +120,4 @@ module ApplicationSettings end end -ApplicationSettings::UpdateService.prepend_if_ee('EE::ApplicationSettings::UpdateService') +ApplicationSettings::UpdateService.prepend_mod_with('ApplicationSettings::UpdateService') diff --git a/app/services/applications/create_service.rb b/app/services/applications/create_service.rb index 92500fbc254..96cde9057c7 100644 --- a/app/services/applications/create_service.rb +++ b/app/services/applications/create_service.rb @@ -25,4 +25,4 @@ module Applications end end -Applications::CreateService.prepend_if_ee('EE::Applications::CreateService') +Applications::CreateService.prepend_mod_with('Applications::CreateService') diff --git a/app/services/audit_event_service.rb b/app/services/audit_event_service.rb index 617e70989bb..60421f61007 100644 --- a/app/services/audit_event_service.rb +++ b/app/services/audit_event_service.rb @@ -136,4 +136,4 @@ class AuditEventService end end -AuditEventService.prepend_if_ee('EE::AuditEventService') +AuditEventService.prepend_mod_with('AuditEventService') diff --git a/app/services/auth/container_registry_authentication_service.rb b/app/services/auth/container_registry_authentication_service.rb index d74f20511bd..5fde346c4ab 100644 --- a/app/services/auth/container_registry_authentication_service.rb +++ b/app/services/auth/container_registry_authentication_service.rb @@ -251,4 +251,4 @@ module Auth end end -Auth::ContainerRegistryAuthenticationService.prepend_if_ee('EE::Auth::ContainerRegistryAuthenticationService') +Auth::ContainerRegistryAuthenticationService.prepend_mod_with('Auth::ContainerRegistryAuthenticationService') diff --git a/app/services/auto_merge_service.rb b/app/services/auto_merge_service.rb index c5cbcc7c93b..912248d3a06 100644 --- a/app/services/auto_merge_service.rb +++ b/app/services/auto_merge_service.rb @@ -74,4 +74,4 @@ class AutoMergeService < BaseService end end -AutoMergeService.prepend_if_ee('EE::AutoMergeService') +AutoMergeService.prepend_mod_with('AutoMergeService') diff --git a/app/services/award_emojis/add_service.rb b/app/services/award_emojis/add_service.rb index ceb7a38cead..f45a4330c09 100644 --- a/app/services/award_emojis/add_service.rb +++ b/app/services/award_emojis/add_service.rb @@ -46,4 +46,4 @@ module AwardEmojis end end -AwardEmojis::AddService.prepend_if_ee('EE::AwardEmojis::AddService') +AwardEmojis::AddService.prepend_mod_with('AwardEmojis::AddService') diff --git a/app/services/award_emojis/destroy_service.rb b/app/services/award_emojis/destroy_service.rb index cfd194262f9..47dc8418e07 100644 --- a/app/services/award_emojis/destroy_service.rb +++ b/app/services/award_emojis/destroy_service.rb @@ -26,4 +26,4 @@ module AwardEmojis end end -AwardEmojis::DestroyService.prepend_if_ee('EE::AwardEmojis::DestroyService') +AwardEmojis::DestroyService.prepend_mod_with('AwardEmojis::DestroyService') diff --git a/app/services/base_count_service.rb b/app/services/base_count_service.rb index 2936bdae16e..c316c488148 100644 --- a/app/services/base_count_service.rb +++ b/app/services/base_count_service.rb @@ -49,4 +49,4 @@ class BaseCountService end end -BaseCountService.prepend_if_ee('EE::BaseCountService') +BaseCountService.prepend_mod_with('BaseCountService') diff --git a/app/services/boards/base_service.rb b/app/services/boards/base_service.rb index 83bb69b3822..f371f88d44b 100644 --- a/app/services/boards/base_service.rb +++ b/app/services/boards/base_service.rb @@ -13,4 +13,4 @@ module Boards end end -Boards::BaseService.prepend_if_ee('EE::Boards::BaseService') +Boards::BaseService.prepend_mod_with('Boards::BaseService') diff --git a/app/services/boards/create_service.rb b/app/services/boards/create_service.rb index 54dab581686..5f014abe071 100644 --- a/app/services/boards/create_service.rb +++ b/app/services/boards/create_service.rb @@ -37,4 +37,4 @@ module Boards end end -Boards::CreateService.prepend_if_ee('EE::Boards::CreateService') +Boards::CreateService.prepend_mod_with('Boards::CreateService') diff --git a/app/services/boards/issues/create_service.rb b/app/services/boards/issues/create_service.rb index 1769966a049..d036556f22a 100644 --- a/app/services/boards/issues/create_service.rb +++ b/app/services/boards/issues/create_service.rb @@ -36,4 +36,4 @@ module Boards end end -Boards::Issues::CreateService.prepend_if_ee('EE::Boards::Issues::CreateService') +Boards::Issues::CreateService.prepend_mod_with('Boards::Issues::CreateService') diff --git a/app/services/boards/issues/list_service.rb b/app/services/boards/issues/list_service.rb index c6855f29af0..6284e454561 100644 --- a/app/services/boards/issues/list_service.rb +++ b/app/services/boards/issues/list_service.rb @@ -50,4 +50,4 @@ module Boards end end -Boards::Issues::ListService.prepend_if_ee('EE::Boards::Issues::ListService') +Boards::Issues::ListService.prepend_mod_with('Boards::Issues::ListService') diff --git a/app/services/boards/issues/move_service.rb b/app/services/boards/issues/move_service.rb index 76ea57968b2..05f9ccb6172 100644 --- a/app/services/boards/issues/move_service.rb +++ b/app/services/boards/issues/move_service.rb @@ -62,4 +62,4 @@ module Boards end end -Boards::Issues::MoveService.prepend_if_ee('EE::Boards::Issues::MoveService') +Boards::Issues::MoveService.prepend_mod_with('Boards::Issues::MoveService') diff --git a/app/services/boards/lists/create_service.rb b/app/services/boards/lists/create_service.rb index 37fe0a815bd..3ee0b6d8821 100644 --- a/app/services/boards/lists/create_service.rb +++ b/app/services/boards/lists/create_service.rb @@ -7,4 +7,4 @@ module Boards end end -Boards::Lists::CreateService.prepend_if_ee('EE::Boards::Lists::CreateService') +Boards::Lists::CreateService.prepend_mod_with('Boards::Lists::CreateService') diff --git a/app/services/boards/lists/list_service.rb b/app/services/boards/lists/list_service.rb index 03d54a8c74c..e81ef467a4e 100644 --- a/app/services/boards/lists/list_service.rb +++ b/app/services/boards/lists/list_service.rb @@ -32,4 +32,4 @@ module Boards end end -Boards::Lists::ListService.prepend_if_ee('EE::Boards::Lists::ListService') +Boards::Lists::ListService.prepend_mod_with('Boards::Lists::ListService') diff --git a/app/services/boards/lists/update_service.rb b/app/services/boards/lists/update_service.rb index 2e1a6592cd9..5c24c0daa73 100644 --- a/app/services/boards/lists/update_service.rb +++ b/app/services/boards/lists/update_service.rb @@ -14,4 +14,4 @@ module Boards end end -Boards::Lists::UpdateService.prepend_if_ee('EE::Boards::Lists::UpdateService') +Boards::Lists::UpdateService.prepend_mod_with('Boards::Lists::UpdateService') diff --git a/app/services/boards/update_service.rb b/app/services/boards/update_service.rb index 48c6e44d55e..6ba8f68a4cb 100644 --- a/app/services/boards/update_service.rb +++ b/app/services/boards/update_service.rb @@ -19,4 +19,4 @@ module Boards end end -Boards::UpdateService.prepend_if_ee('EE::Boards::UpdateService') +Boards::UpdateService.prepend_mod_with('Boards::UpdateService') diff --git a/app/services/ci/change_variable_service.rb b/app/services/ci/change_variable_service.rb index f515a335d54..83cd6aae14b 100644 --- a/app/services/ci/change_variable_service.rb +++ b/app/services/ci/change_variable_service.rb @@ -30,4 +30,4 @@ module Ci end end -::Ci::ChangeVariableService.prepend_if_ee('EE::Ci::ChangeVariableService') +::Ci::ChangeVariableService.prepend_mod_with('Ci::ChangeVariableService') diff --git a/app/services/ci/change_variables_service.rb b/app/services/ci/change_variables_service.rb index 3337eb09411..7a68bd2e2b3 100644 --- a/app/services/ci/change_variables_service.rb +++ b/app/services/ci/change_variables_service.rb @@ -8,4 +8,4 @@ module Ci end end -::Ci::ChangeVariablesService.prepend_if_ee('EE::Ci::ChangeVariablesService') +::Ci::ChangeVariablesService.prepend_mod_with('Ci::ChangeVariablesService') diff --git a/app/services/ci/create_pipeline_service.rb b/app/services/ci/create_pipeline_service.rb index bdbef9117e6..fd333e24860 100644 --- a/app/services/ci/create_pipeline_service.rb +++ b/app/services/ci/create_pipeline_service.rb @@ -132,4 +132,4 @@ module Ci end end -Ci::CreatePipelineService.prepend_if_ee('EE::Ci::CreatePipelineService') +Ci::CreatePipelineService.prepend_mod_with('Ci::CreatePipelineService') diff --git a/app/services/ci/job_artifacts/destroy_batch_service.rb b/app/services/ci/job_artifacts/destroy_batch_service.rb index 95315dd11ec..8ecf5cf55dd 100644 --- a/app/services/ci/job_artifacts/destroy_batch_service.rb +++ b/app/services/ci/job_artifacts/destroy_batch_service.rb @@ -71,4 +71,4 @@ module Ci end end -Ci::JobArtifacts::DestroyBatchService.prepend_if_ee('EE::Ci::JobArtifacts::DestroyBatchService') +Ci::JobArtifacts::DestroyBatchService.prepend_mod_with('Ci::JobArtifacts::DestroyBatchService') diff --git a/app/services/ci/pipeline_bridge_status_service.rb b/app/services/ci/pipeline_bridge_status_service.rb index e2e5dd386f2..aeac43588f7 100644 --- a/app/services/ci/pipeline_bridge_status_service.rb +++ b/app/services/ci/pipeline_bridge_status_service.rb @@ -17,4 +17,4 @@ module Ci end end -Ci::PipelineBridgeStatusService.prepend_if_ee('EE::Ci::PipelineBridgeStatusService') +Ci::PipelineBridgeStatusService.prepend_mod_with('Ci::PipelineBridgeStatusService') diff --git a/app/services/ci/process_build_service.rb b/app/services/ci/process_build_service.rb index 73cf3308fe7..5271c0fe93d 100644 --- a/app/services/ci/process_build_service.rb +++ b/app/services/ci/process_build_service.rb @@ -40,4 +40,4 @@ module Ci end end -Ci::ProcessBuildService.prepend_if_ee('EE::Ci::ProcessBuildService') +Ci::ProcessBuildService.prepend_mod_with('Ci::ProcessBuildService') diff --git a/app/services/ci/register_job_service.rb b/app/services/ci/register_job_service.rb index bb82f9eed22..461647ffccc 100644 --- a/app/services/ci/register_job_service.rb +++ b/app/services/ci/register_job_service.rb @@ -316,4 +316,4 @@ module Ci end end -Ci::RegisterJobService.prepend_if_ee('EE::Ci::RegisterJobService') +Ci::RegisterJobService.prepend_mod_with('Ci::RegisterJobService') diff --git a/app/services/ci/retry_build_service.rb b/app/services/ci/retry_build_service.rb index e3de7f43fda..d5e64828c1f 100644 --- a/app/services/ci/retry_build_service.rb +++ b/app/services/ci/retry_build_service.rb @@ -64,4 +64,4 @@ module Ci end end -Ci::RetryBuildService.prepend_if_ee('EE::Ci::RetryBuildService') +Ci::RetryBuildService.prepend_mod_with('Ci::RetryBuildService') diff --git a/app/services/commits/create_service.rb b/app/services/commits/create_service.rb index a1498da302e..fc18420f6e4 100644 --- a/app/services/commits/create_service.rb +++ b/app/services/commits/create_service.rb @@ -113,4 +113,4 @@ module Commits end end -Commits::CreateService.prepend_if_ee('EE::Commits::CreateService') +Commits::CreateService.prepend_mod_with('Commits::CreateService') diff --git a/app/services/concerns/alert_management/alert_processing.rb b/app/services/concerns/alert_management/alert_processing.rb index a1520258de8..9690d703408 100644 --- a/app/services/concerns/alert_management/alert_processing.rb +++ b/app/services/concerns/alert_management/alert_processing.rb @@ -129,4 +129,4 @@ module AlertManagement end end -AlertManagement::AlertProcessing.prepend_ee_mod +AlertManagement::AlertProcessing.prepend_mod diff --git a/app/services/concerns/measurable.rb b/app/services/concerns/measurable.rb index fcb3022a1dc..ebce8a0667a 100644 --- a/app/services/concerns/measurable.rb +++ b/app/services/concerns/measurable.rb @@ -23,7 +23,7 @@ # end # end # -# DummyService.prepend_if_ee('EE::DummyService') +# DummyService.prepend_mod_with('DummyService') # DummyService.prepend(Measurable) # ``` # diff --git a/app/services/deploy_keys/create_service.rb b/app/services/deploy_keys/create_service.rb index 2dac94c7ade..3245e749164 100644 --- a/app/services/deploy_keys/create_service.rb +++ b/app/services/deploy_keys/create_service.rb @@ -8,4 +8,4 @@ module DeployKeys end end -DeployKeys::CreateService.prepend_if_ee('::EE::DeployKeys::CreateService') +DeployKeys::CreateService.prepend_mod_with('DeployKeys::CreateService') diff --git a/app/services/deployments/update_environment_service.rb b/app/services/deployments/update_environment_service.rb index 98fedb9f699..9e862d6fa52 100644 --- a/app/services/deployments/update_environment_service.rb +++ b/app/services/deployments/update_environment_service.rb @@ -77,4 +77,4 @@ module Deployments end end -Deployments::UpdateEnvironmentService.prepend_if_ee('EE::Deployments::UpdateEnvironmentService') +Deployments::UpdateEnvironmentService.prepend_mod_with('Deployments::UpdateEnvironmentService') diff --git a/app/services/design_management/delete_designs_service.rb b/app/services/design_management/delete_designs_service.rb index a90c34d4e34..7f76bcc5626 100644 --- a/app/services/design_management/delete_designs_service.rb +++ b/app/services/design_management/delete_designs_service.rb @@ -67,4 +67,4 @@ module DesignManagement end end -DesignManagement::DeleteDesignsService.prepend_if_ee('EE::DesignManagement::DeleteDesignsService') +DesignManagement::DeleteDesignsService.prepend_mod_with('DesignManagement::DeleteDesignsService') diff --git a/app/services/design_management/save_designs_service.rb b/app/services/design_management/save_designs_service.rb index c26d2e7ab47..44ebd45f76e 100644 --- a/app/services/design_management/save_designs_service.rb +++ b/app/services/design_management/save_designs_service.rb @@ -141,4 +141,4 @@ module DesignManagement end end -DesignManagement::SaveDesignsService.prepend_if_ee('EE::DesignManagement::SaveDesignsService') +DesignManagement::SaveDesignsService.prepend_mod_with('DesignManagement::SaveDesignsService') diff --git a/app/services/emails/base_service.rb b/app/services/emails/base_service.rb index c94505b2068..58fc9799673 100644 --- a/app/services/emails/base_service.rb +++ b/app/services/emails/base_service.rb @@ -12,4 +12,4 @@ module Emails end end -Emails::BaseService.prepend_if_ee('::EE::Emails::BaseService') +Emails::BaseService.prepend_mod_with('Emails::BaseService') diff --git a/app/services/emails/create_service.rb b/app/services/emails/create_service.rb index 473256d9c6f..011978ba76a 100644 --- a/app/services/emails/create_service.rb +++ b/app/services/emails/create_service.rb @@ -12,4 +12,4 @@ module Emails end end -Emails::CreateService.prepend_if_ee('EE::Emails::CreateService') +Emails::CreateService.prepend_mod_with('Emails::CreateService') diff --git a/app/services/emails/destroy_service.rb b/app/services/emails/destroy_service.rb index 6e671f52d57..288bee84ef7 100644 --- a/app/services/emails/destroy_service.rb +++ b/app/services/emails/destroy_service.rb @@ -18,4 +18,4 @@ module Emails end end -Emails::DestroyService.prepend_if_ee('EE::Emails::DestroyService') +Emails::DestroyService.prepend_mod_with('Emails::DestroyService') diff --git a/app/services/event_create_service.rb b/app/services/event_create_service.rb index 85658598afc..01a40fc6473 100644 --- a/app/services/event_create_service.rb +++ b/app/services/event_create_service.rb @@ -222,4 +222,4 @@ class EventCreateService end end -EventCreateService.prepend_if_ee('EE::EventCreateService') +EventCreateService.prepend_mod_with('EventCreateService') diff --git a/app/services/git/branch_hooks_service.rb b/app/services/git/branch_hooks_service.rb index 4b802803a07..a49b981c680 100644 --- a/app/services/git/branch_hooks_service.rb +++ b/app/services/git/branch_hooks_service.rb @@ -226,4 +226,4 @@ module Git end end -Git::BranchHooksService.prepend_if_ee('::EE::Git::BranchHooksService') +Git::BranchHooksService.prepend_mod_with('Git::BranchHooksService') diff --git a/app/services/git/branch_push_service.rb b/app/services/git/branch_push_service.rb index d250bca7bf2..5dcc2de456c 100644 --- a/app/services/git/branch_push_service.rb +++ b/app/services/git/branch_push_service.rb @@ -94,4 +94,4 @@ module Git end end -Git::BranchPushService.prepend_if_ee('::EE::Git::BranchPushService') +Git::BranchPushService.prepend_mod_with('Git::BranchPushService') diff --git a/app/services/git/tag_hooks_service.rb b/app/services/git/tag_hooks_service.rb index 0e5e1bbc992..d83924fec28 100644 --- a/app/services/git/tag_hooks_service.rb +++ b/app/services/git/tag_hooks_service.rb @@ -35,4 +35,4 @@ module Git end end -Git::TagHooksService.prepend_if_ee('::EE::Git::TagHooksService') +Git::TagHooksService.prepend_mod_with('Git::TagHooksService') diff --git a/app/services/git/wiki_push_service.rb b/app/services/git/wiki_push_service.rb index 82958abfe6e..11aeb650a5b 100644 --- a/app/services/git/wiki_push_service.rb +++ b/app/services/git/wiki_push_service.rb @@ -86,4 +86,4 @@ module Git end end -Git::WikiPushService.prepend_if_ee('EE::Git::WikiPushService') +Git::WikiPushService.prepend_mod_with('Git::WikiPushService') diff --git a/app/services/groups/autocomplete_service.rb b/app/services/groups/autocomplete_service.rb index 14f11bb3cfd..92b05d9ac08 100644 --- a/app/services/groups/autocomplete_service.rb +++ b/app/services/groups/autocomplete_service.rb @@ -46,4 +46,4 @@ module Groups end end -Groups::AutocompleteService.prepend_if_ee('EE::Groups::AutocompleteService') +Groups::AutocompleteService.prepend_mod diff --git a/app/services/groups/create_service.rb b/app/services/groups/create_service.rb index 9ddb8ae7695..80c428f727c 100644 --- a/app/services/groups/create_service.rb +++ b/app/services/groups/create_service.rb @@ -103,4 +103,4 @@ module Groups end end -Groups::CreateService.prepend_if_ee('EE::Groups::CreateService') +Groups::CreateService.prepend_mod_with('Groups::CreateService') diff --git a/app/services/groups/destroy_service.rb b/app/services/groups/destroy_service.rb index a27330d1104..08c4e0231e7 100644 --- a/app/services/groups/destroy_service.rb +++ b/app/services/groups/destroy_service.rb @@ -58,4 +58,4 @@ module Groups end end -Groups::DestroyService.prepend_if_ee('EE::Groups::DestroyService') +Groups::DestroyService.prepend_mod_with('Groups::DestroyService') diff --git a/app/services/groups/import_export/export_service.rb b/app/services/groups/import_export/export_service.rb index 5ba34460871..ea26ebec20b 100644 --- a/app/services/groups/import_export/export_service.rb +++ b/app/services/groups/import_export/export_service.rb @@ -127,4 +127,4 @@ module Groups end end -Groups::ImportExport::ExportService.prepend_if_ee('EE::Groups::ImportExport::ExportService') +Groups::ImportExport::ExportService.prepend_mod_with('Groups::ImportExport::ExportService') diff --git a/app/services/groups/import_export/import_service.rb b/app/services/groups/import_export/import_service.rb index 25ef2db49c3..f9db552f743 100644 --- a/app/services/groups/import_export/import_service.rb +++ b/app/services/groups/import_export/import_service.rb @@ -124,4 +124,4 @@ module Groups end end -Groups::ImportExport::ImportService.prepend_if_ee('EE::Groups::ImportExport::ImportService') +Groups::ImportExport::ImportService.prepend_mod_with('Groups::ImportExport::ImportService') diff --git a/app/services/groups/transfer_service.rb b/app/services/groups/transfer_service.rb index e800e546a45..ff0300d7e26 100644 --- a/app/services/groups/transfer_service.rb +++ b/app/services/groups/transfer_service.rb @@ -212,4 +212,4 @@ module Groups end end -Groups::TransferService.prepend_if_ee('EE::Groups::TransferService') +Groups::TransferService.prepend_mod_with('Groups::TransferService') diff --git a/app/services/groups/update_service.rb b/app/services/groups/update_service.rb index ff369d01efc..1ad43b051be 100644 --- a/app/services/groups/update_service.rb +++ b/app/services/groups/update_service.rb @@ -147,4 +147,4 @@ module Groups end end -Groups::UpdateService.prepend_if_ee('EE::Groups::UpdateService') +Groups::UpdateService.prepend_mod_with('Groups::UpdateService') diff --git a/app/services/ide/schemas_config_service.rb b/app/services/ide/schemas_config_service.rb index 65799c03364..a013a4679b5 100644 --- a/app/services/ide/schemas_config_service.rb +++ b/app/services/ide/schemas_config_service.rb @@ -46,4 +46,4 @@ module Ide end end -Ide::SchemasConfigService.prepend_if_ee('::EE::Ide::SchemasConfigService') +Ide::SchemasConfigService.prepend_mod_with('Ide::SchemasConfigService') diff --git a/app/services/import/github_service.rb b/app/services/import/github_service.rb index 3ee5a185f42..2f808d45ffd 100644 --- a/app/services/import/github_service.rb +++ b/app/services/import/github_service.rb @@ -122,4 +122,4 @@ module Import end end -Import::GithubService.prepend_if_ee('EE::Import::GithubService') +Import::GithubService.prepend_mod_with('Import::GithubService') diff --git a/app/services/integrations/test/project_service.rb b/app/services/integrations/test/project_service.rb index d72ca928c34..31c8f02c7b6 100644 --- a/app/services/integrations/test/project_service.rb +++ b/app/services/integrations/test/project_service.rb @@ -42,4 +42,4 @@ module Integrations end end -Integrations::Test::ProjectService.prepend_if_ee('::EE::Integrations::Test::ProjectService') +Integrations::Test::ProjectService.prepend_mod_with('Integrations::Test::ProjectService') diff --git a/app/services/issuable/bulk_update_service.rb b/app/services/issuable/bulk_update_service.rb index 5d5a6db92bb..824415215ec 100644 --- a/app/services/issuable/bulk_update_service.rb +++ b/app/services/issuable/bulk_update_service.rb @@ -99,4 +99,4 @@ module Issuable end end -Issuable::BulkUpdateService.prepend_if_ee('EE::Issuable::BulkUpdateService') +Issuable::BulkUpdateService.prepend_mod_with('Issuable::BulkUpdateService') diff --git a/app/services/issuable/clone/attributes_rewriter.rb b/app/services/issuable/clone/attributes_rewriter.rb index 3861d88bce9..d0544dabbfd 100644 --- a/app/services/issuable/clone/attributes_rewriter.rb +++ b/app/services/issuable/clone/attributes_rewriter.rb @@ -118,4 +118,4 @@ module Issuable end end -Issuable::Clone::AttributesRewriter.prepend_if_ee('EE::Issuable::Clone::AttributesRewriter') +Issuable::Clone::AttributesRewriter.prepend_mod_with('Issuable::Clone::AttributesRewriter') diff --git a/app/services/issuable/clone/base_service.rb b/app/services/issuable/clone/base_service.rb index 3c2bc527b12..3d73a142f31 100644 --- a/app/services/issuable/clone/base_service.rb +++ b/app/services/issuable/clone/base_service.rb @@ -88,4 +88,4 @@ module Issuable end end -Issuable::Clone::BaseService.prepend_if_ee('EE::Issuable::Clone::BaseService') +Issuable::Clone::BaseService.prepend_mod_with('Issuable::Clone::BaseService') diff --git a/app/services/issuable/common_system_notes_service.rb b/app/services/issuable/common_system_notes_service.rb index fd2dc3787c2..f69dde4caa8 100644 --- a/app/services/issuable/common_system_notes_service.rb +++ b/app/services/issuable/common_system_notes_service.rb @@ -109,4 +109,4 @@ module Issuable end end -Issuable::CommonSystemNotesService.prepend_if_ee('EE::Issuable::CommonSystemNotesService') +Issuable::CommonSystemNotesService.prepend_mod_with('Issuable::CommonSystemNotesService') diff --git a/app/services/issuable/destroy_service.rb b/app/services/issuable/destroy_service.rb index d5aa84d8d6c..1da3fbe0749 100644 --- a/app/services/issuable/destroy_service.rb +++ b/app/services/issuable/destroy_service.rb @@ -35,4 +35,4 @@ module Issuable end end -Issuable::DestroyService.prepend_if_ee('EE::Issuable::DestroyService') +Issuable::DestroyService.prepend_mod_with('Issuable::DestroyService') diff --git a/app/services/issuable_base_service.rb b/app/services/issuable_base_service.rb index add53bc6267..02d005fb569 100644 --- a/app/services/issuable_base_service.rb +++ b/app/services/issuable_base_service.rb @@ -493,4 +493,4 @@ class IssuableBaseService < BaseService end end -IssuableBaseService.prepend_if_ee('EE::IssuableBaseService') +IssuableBaseService.prepend_mod_with('IssuableBaseService') diff --git a/app/services/issuable_links/create_service.rb b/app/services/issuable_links/create_service.rb index cbb81f1f521..81685f81afa 100644 --- a/app/services/issuable_links/create_service.rb +++ b/app/services/issuable_links/create_service.rb @@ -118,4 +118,4 @@ module IssuableLinks end end -IssuableLinks::CreateService.prepend_if_ee('EE::IssuableLinks::CreateService') +IssuableLinks::CreateService.prepend_mod_with('IssuableLinks::CreateService') diff --git a/app/services/issue_links/create_service.rb b/app/services/issue_links/create_service.rb index 63762b1af79..a022d3e0bcf 100644 --- a/app/services/issue_links/create_service.rb +++ b/app/services/issue_links/create_service.rb @@ -43,4 +43,4 @@ module IssueLinks end end -IssueLinks::CreateService.prepend_if_ee('EE::IssueLinks::CreateService') +IssueLinks::CreateService.prepend_mod_with('IssueLinks::CreateService') diff --git a/app/services/issues/after_create_service.rb b/app/services/issues/after_create_service.rb index 0c6ec65f0e2..5d10eca2979 100644 --- a/app/services/issues/after_create_service.rb +++ b/app/services/issues/after_create_service.rb @@ -10,4 +10,4 @@ module Issues end end -Issues::AfterCreateService.prepend_ee_mod +Issues::AfterCreateService.prepend_mod diff --git a/app/services/issues/base_service.rb b/app/services/issues/base_service.rb index 07e4a10708e..54b9e9d6c4b 100644 --- a/app/services/issues/base_service.rb +++ b/app/services/issues/base_service.rb @@ -78,4 +78,4 @@ module Issues end end -Issues::BaseService.prepend_if_ee('EE::Issues::BaseService') +Issues::BaseService.prepend_mod_with('Issues::BaseService') diff --git a/app/services/issues/build_service.rb b/app/services/issues/build_service.rb index 3145739fe91..bdb4b39b0ba 100644 --- a/app/services/issues/build_service.rb +++ b/app/services/issues/build_service.rb @@ -88,4 +88,4 @@ module Issues end end -Issues::BuildService.prepend_if_ee('EE::Issues::BuildService') +Issues::BuildService.prepend_mod_with('Issues::BuildService') diff --git a/app/services/issues/clone_service.rb b/app/services/issues/clone_service.rb index b64e4687a87..fc1cde5fabc 100644 --- a/app/services/issues/clone_service.rb +++ b/app/services/issues/clone_service.rb @@ -90,4 +90,4 @@ module Issues end end -Issues::CloneService.prepend_if_ee('EE::Issues::CloneService') +Issues::CloneService.prepend_mod_with('Issues::CloneService') diff --git a/app/services/issues/create_service.rb b/app/services/issues/create_service.rb index 68660b35bee..951dad486cb 100644 --- a/app/services/issues/create_service.rb +++ b/app/services/issues/create_service.rb @@ -75,4 +75,4 @@ module Issues end end -Issues::CreateService.prepend_ee_mod +Issues::CreateService.prepend_mod diff --git a/app/services/issues/export_csv_service.rb b/app/services/issues/export_csv_service.rb index dd43c77adfa..3809d8bc347 100644 --- a/app/services/issues/export_csv_service.rb +++ b/app/services/issues/export_csv_service.rb @@ -58,4 +58,4 @@ module Issues end end -Issues::ExportCsvService.prepend_if_ee('EE::Issues::ExportCsvService') +Issues::ExportCsvService.prepend_mod_with('Issues::ExportCsvService') diff --git a/app/services/issues/move_service.rb b/app/services/issues/move_service.rb index c1afb8f456d..ace1434356b 100644 --- a/app/services/issues/move_service.rb +++ b/app/services/issues/move_service.rb @@ -106,4 +106,4 @@ module Issues end end -Issues::MoveService.prepend_if_ee('EE::Issues::MoveService') +Issues::MoveService.prepend_mod_with('Issues::MoveService') diff --git a/app/services/issues/update_service.rb b/app/services/issues/update_service.rb index 934b7f2016e..bd3f80773ac 100644 --- a/app/services/issues/update_service.rb +++ b/app/services/issues/update_service.rb @@ -210,4 +210,4 @@ module Issues end end -Issues::UpdateService.prepend_if_ee('EE::Issues::UpdateService') +Issues::UpdateService.prepend_mod_with('Issues::UpdateService') diff --git a/app/services/keys/create_service.rb b/app/services/keys/create_service.rb index c1c3ef8792f..507537391ed 100644 --- a/app/services/keys/create_service.rb +++ b/app/services/keys/create_service.rb @@ -19,4 +19,4 @@ module Keys end end -Keys::CreateService.prepend_if_ee('EE::Keys::CreateService') +Keys::CreateService.prepend_mod_with('Keys::CreateService') diff --git a/app/services/keys/destroy_service.rb b/app/services/keys/destroy_service.rb index 4552c5cf9a2..eaf5eb35f58 100644 --- a/app/services/keys/destroy_service.rb +++ b/app/services/keys/destroy_service.rb @@ -13,4 +13,4 @@ module Keys end end -Keys::DestroyService.prepend_if_ee('EE::Keys::DestroyService') +Keys::DestroyService.prepend_mod_with('Keys::DestroyService') diff --git a/app/services/labels/create_service.rb b/app/services/labels/create_service.rb index 665d1035b2b..6c070d15cdb 100644 --- a/app/services/labels/create_service.rb +++ b/app/services/labels/create_service.rb @@ -26,4 +26,4 @@ module Labels end end -Labels::CreateService.prepend_if_ee('EE::Labels::CreateService') +Labels::CreateService.prepend_mod_with('Labels::CreateService') diff --git a/app/services/labels/promote_service.rb b/app/services/labels/promote_service.rb index fdf2cf13f92..e3b110f8f26 100644 --- a/app/services/labels/promote_service.rb +++ b/app/services/labels/promote_service.rb @@ -101,4 +101,4 @@ module Labels end end -Labels::PromoteService.prepend_if_ee('EE::Labels::PromoteService') +Labels::PromoteService.prepend_mod_with('Labels::PromoteService') diff --git a/app/services/lfs/lock_file_service.rb b/app/services/lfs/lock_file_service.rb index 03f8946362b..54f193c86e6 100644 --- a/app/services/lfs/lock_file_service.rb +++ b/app/services/lfs/lock_file_service.rb @@ -42,4 +42,4 @@ module Lfs end end -Lfs::LockFileService.prepend_if_ee('EE::Lfs::LockFileService') +Lfs::LockFileService.prepend_mod_with('Lfs::LockFileService') diff --git a/app/services/lfs/unlock_file_service.rb b/app/services/lfs/unlock_file_service.rb index f69f4091606..7a3025ee7ea 100644 --- a/app/services/lfs/unlock_file_service.rb +++ b/app/services/lfs/unlock_file_service.rb @@ -46,4 +46,4 @@ module Lfs end end -Lfs::UnlockFileService.prepend_if_ee('EE::Lfs::UnlockFileService') +Lfs::UnlockFileService.prepend_mod_with('Lfs::UnlockFileService') diff --git a/app/services/members/approve_access_request_service.rb b/app/services/members/approve_access_request_service.rb index e79c5f69a30..919c22894c1 100644 --- a/app/services/members/approve_access_request_service.rb +++ b/app/services/members/approve_access_request_service.rb @@ -21,4 +21,4 @@ module Members end end -Members::ApproveAccessRequestService.prepend_if_ee('EE::Members::ApproveAccessRequestService') +Members::ApproveAccessRequestService.prepend_mod_with('Members::ApproveAccessRequestService') diff --git a/app/services/members/create_service.rb b/app/services/members/create_service.rb index 953cf7f5bf6..7b81cc27635 100644 --- a/app/services/members/create_service.rb +++ b/app/services/members/create_service.rb @@ -98,4 +98,4 @@ module Members end end -Members::CreateService.prepend_if_ee('EE::Members::CreateService') +Members::CreateService.prepend_mod_with('Members::CreateService') diff --git a/app/services/members/destroy_service.rb b/app/services/members/destroy_service.rb index 8cad065e6cc..bb2d419c046 100644 --- a/app/services/members/destroy_service.rb +++ b/app/services/members/destroy_service.rb @@ -117,4 +117,4 @@ module Members end end -Members::DestroyService.prepend_if_ee('EE::Members::DestroyService') +Members::DestroyService.prepend_mod_with('Members::DestroyService') diff --git a/app/services/members/update_service.rb b/app/services/members/update_service.rb index 5c6e51201c2..257698f65ae 100644 --- a/app/services/members/update_service.rb +++ b/app/services/members/update_service.rb @@ -31,4 +31,4 @@ module Members end end -Members::UpdateService.prepend_if_ee('EE::Members::UpdateService') +Members::UpdateService.prepend_mod_with('Members::UpdateService') diff --git a/app/services/merge_request_metrics_service.rb b/app/services/merge_request_metrics_service.rb index 9ea71838011..d86bcca8892 100644 --- a/app/services/merge_request_metrics_service.rb +++ b/app/services/merge_request_metrics_service.rb @@ -20,4 +20,4 @@ class MergeRequestMetricsService end end -MergeRequestMetricsService.prepend_if_ee('EE::MergeRequestMetricsService') +MergeRequestMetricsService.prepend_mod_with('MergeRequestMetricsService') diff --git a/app/services/merge_requests/after_create_service.rb b/app/services/merge_requests/after_create_service.rb index ed9747a8c99..cce0d06b458 100644 --- a/app/services/merge_requests/after_create_service.rb +++ b/app/services/merge_requests/after_create_service.rb @@ -40,4 +40,4 @@ module MergeRequests end end -MergeRequests::AfterCreateService.prepend_if_ee('EE::MergeRequests::AfterCreateService') +MergeRequests::AfterCreateService.prepend_mod_with('MergeRequests::AfterCreateService') diff --git a/app/services/merge_requests/approval_service.rb b/app/services/merge_requests/approval_service.rb index 59d8f553eff..62e599e3e27 100644 --- a/app/services/merge_requests/approval_service.rb +++ b/app/services/merge_requests/approval_service.rb @@ -54,4 +54,4 @@ module MergeRequests end end -MergeRequests::ApprovalService.prepend_if_ee('EE::MergeRequests::ApprovalService') +MergeRequests::ApprovalService.prepend_mod_with('MergeRequests::ApprovalService') diff --git a/app/services/merge_requests/base_service.rb b/app/services/merge_requests/base_service.rb index 3a3765355d8..1072049738b 100644 --- a/app/services/merge_requests/base_service.rb +++ b/app/services/merge_requests/base_service.rb @@ -208,4 +208,4 @@ module MergeRequests end end -MergeRequests::BaseService.prepend_if_ee('EE::MergeRequests::BaseService') +MergeRequests::BaseService.prepend_mod_with('MergeRequests::BaseService') diff --git a/app/services/merge_requests/build_service.rb b/app/services/merge_requests/build_service.rb index ecc55eae5de..878e42172b7 100644 --- a/app/services/merge_requests/build_service.rb +++ b/app/services/merge_requests/build_service.rb @@ -300,4 +300,4 @@ module MergeRequests end end -MergeRequests::BuildService.prepend_if_ee('EE::MergeRequests::BuildService') +MergeRequests::BuildService.prepend_mod_with('MergeRequests::BuildService') diff --git a/app/services/merge_requests/create_pipeline_service.rb b/app/services/merge_requests/create_pipeline_service.rb index 46c4c102091..ebeba0ee5b8 100644 --- a/app/services/merge_requests/create_pipeline_service.rb +++ b/app/services/merge_requests/create_pipeline_service.rb @@ -63,4 +63,4 @@ module MergeRequests end end -MergeRequests::CreatePipelineService.prepend_if_ee('EE::MergeRequests::CreatePipelineService') +MergeRequests::CreatePipelineService.prepend_mod_with('MergeRequests::CreatePipelineService') diff --git a/app/services/merge_requests/create_service.rb b/app/services/merge_requests/create_service.rb index 8186472ec65..c1292d924b2 100644 --- a/app/services/merge_requests/create_service.rb +++ b/app/services/merge_requests/create_service.rb @@ -53,4 +53,4 @@ module MergeRequests end end -MergeRequests::CreateService.include_if_ee('EE::MergeRequests::CreateService') +MergeRequests::CreateService.include_mod_with('MergeRequests::CreateService') diff --git a/app/services/merge_requests/handle_assignees_change_service.rb b/app/services/merge_requests/handle_assignees_change_service.rb index 77ff0791eb4..a8d122fb71f 100644 --- a/app/services/merge_requests/handle_assignees_change_service.rb +++ b/app/services/merge_requests/handle_assignees_change_service.rb @@ -40,4 +40,4 @@ module MergeRequests end end -MergeRequests::HandleAssigneesChangeService.prepend_if_ee('EE::MergeRequests::HandleAssigneesChangeService') +MergeRequests::HandleAssigneesChangeService.prepend_mod_with('MergeRequests::HandleAssigneesChangeService') diff --git a/app/services/merge_requests/merge_base_service.rb b/app/services/merge_requests/merge_base_service.rb index fe09c92aab9..3d1b7616e76 100644 --- a/app/services/merge_requests/merge_base_service.rb +++ b/app/services/merge_requests/merge_base_service.rb @@ -73,4 +73,4 @@ module MergeRequests end end -MergeRequests::MergeBaseService.prepend_if_ee('EE::MergeRequests::MergeBaseService') +MergeRequests::MergeBaseService.prepend_mod_with('MergeRequests::MergeBaseService') diff --git a/app/services/merge_requests/post_merge_service.rb b/app/services/merge_requests/post_merge_service.rb index 505625d2e00..1c9b802780e 100644 --- a/app/services/merge_requests/post_merge_service.rb +++ b/app/services/merge_requests/post_merge_service.rb @@ -67,4 +67,4 @@ module MergeRequests end end -MergeRequests::PostMergeService.prepend_if_ee('EE::MergeRequests::PostMergeService') +MergeRequests::PostMergeService.prepend_mod_with('MergeRequests::PostMergeService') diff --git a/app/services/merge_requests/refresh_service.rb b/app/services/merge_requests/refresh_service.rb index 6a5a7196c61..463f9f3d6d1 100644 --- a/app/services/merge_requests/refresh_service.rb +++ b/app/services/merge_requests/refresh_service.rb @@ -304,4 +304,4 @@ module MergeRequests end end -MergeRequests::RefreshService.prepend_if_ee('EE::MergeRequests::RefreshService') +MergeRequests::RefreshService.prepend_mod_with('MergeRequests::RefreshService') diff --git a/app/services/merge_requests/remove_approval_service.rb b/app/services/merge_requests/remove_approval_service.rb index f2bf5de61c1..872e7e0c89c 100644 --- a/app/services/merge_requests/remove_approval_service.rb +++ b/app/services/merge_requests/remove_approval_service.rb @@ -41,4 +41,4 @@ module MergeRequests end end -MergeRequests::RemoveApprovalService.prepend_if_ee('EE::MergeRequests::RemoveApprovalService') +MergeRequests::RemoveApprovalService.prepend_mod_with('MergeRequests::RemoveApprovalService') diff --git a/app/services/merge_requests/update_assignees_service.rb b/app/services/merge_requests/update_assignees_service.rb index b339a644e8c..91797c31e85 100644 --- a/app/services/merge_requests/update_assignees_service.rb +++ b/app/services/merge_requests/update_assignees_service.rb @@ -61,4 +61,4 @@ module MergeRequests end end -MergeRequests::UpdateAssigneesService.prepend_if_ee('EE::MergeRequests::UpdateAssigneesService') +MergeRequests::UpdateAssigneesService.prepend_mod_with('MergeRequests::UpdateAssigneesService') diff --git a/app/services/merge_requests/update_service.rb b/app/services/merge_requests/update_service.rb index 016d8efe218..9522bdc7419 100644 --- a/app/services/merge_requests/update_service.rb +++ b/app/services/merge_requests/update_service.rb @@ -313,4 +313,4 @@ module MergeRequests end end -MergeRequests::UpdateService.prepend_if_ee('EE::MergeRequests::UpdateService') +MergeRequests::UpdateService.prepend_mod_with('MergeRequests::UpdateService') diff --git a/app/services/milestones/promote_service.rb b/app/services/milestones/promote_service.rb index 2431318cbb2..4417f17f33e 100644 --- a/app/services/milestones/promote_service.rb +++ b/app/services/milestones/promote_service.rb @@ -90,4 +90,4 @@ module Milestones end end -Milestones::PromoteService.prepend_if_ee('EE::Milestones::PromoteService') +Milestones::PromoteService.prepend_mod_with('Milestones::PromoteService') diff --git a/app/services/milestones/update_service.rb b/app/services/milestones/update_service.rb index 782c6bc3e35..b9a12a35d31 100644 --- a/app/services/milestones/update_service.rb +++ b/app/services/milestones/update_service.rb @@ -21,4 +21,4 @@ module Milestones end end -Milestones::UpdateService.prepend_if_ee('EE::Milestones::UpdateService') +Milestones::UpdateService.prepend_mod_with('Milestones::UpdateService') diff --git a/app/services/namespace_settings/update_service.rb b/app/services/namespace_settings/update_service.rb index c6c04b63690..de54eb87cc0 100644 --- a/app/services/namespace_settings/update_service.rb +++ b/app/services/namespace_settings/update_service.rb @@ -35,4 +35,4 @@ module NamespaceSettings end end -NamespaceSettings::UpdateService.prepend_if_ee('EE::NamespaceSettings::UpdateService') +NamespaceSettings::UpdateService.prepend_mod_with('NamespaceSettings::UpdateService') diff --git a/app/services/namespaces/in_product_marketing_emails_service.rb b/app/services/namespaces/in_product_marketing_emails_service.rb index 3ddb4535bae..61d5ed3bdf4 100644 --- a/app/services/namespaces/in_product_marketing_emails_service.rb +++ b/app/services/namespaces/in_product_marketing_emails_service.rb @@ -145,4 +145,4 @@ module Namespaces end end -Namespaces::InProductMarketingEmailsService.prepend_ee_mod +Namespaces::InProductMarketingEmailsService.prepend_mod diff --git a/app/services/notes/create_service.rb b/app/services/notes/create_service.rb index e63099a0820..542fafb901b 100644 --- a/app/services/notes/create_service.rb +++ b/app/services/notes/create_service.rb @@ -133,4 +133,4 @@ module Notes end end -Notes::CreateService.prepend_if_ee('EE::Notes::CreateService') +Notes::CreateService.prepend_mod_with('Notes::CreateService') diff --git a/app/services/notes/destroy_service.rb b/app/services/notes/destroy_service.rb index 85f54a39add..c25b1ab0379 100644 --- a/app/services/notes/destroy_service.rb +++ b/app/services/notes/destroy_service.rb @@ -24,4 +24,4 @@ module Notes end end -Notes::DestroyService.prepend_if_ee('EE::Notes::DestroyService') +Notes::DestroyService.prepend_mod_with('Notes::DestroyService') diff --git a/app/services/notes/post_process_service.rb b/app/services/notes/post_process_service.rb index 4f3b2000e9a..b7ccdbc1cff 100644 --- a/app/services/notes/post_process_service.rb +++ b/app/services/notes/post_process_service.rb @@ -44,4 +44,4 @@ module Notes end end -Notes::PostProcessService.prepend_if_ee('EE::Notes::PostProcessService') +Notes::PostProcessService.prepend_mod_with('Notes::PostProcessService') diff --git a/app/services/notes/quick_actions_service.rb b/app/services/notes/quick_actions_service.rb index 36d9f1d7867..4bcd2586788 100644 --- a/app/services/notes/quick_actions_service.rb +++ b/app/services/notes/quick_actions_service.rb @@ -60,4 +60,4 @@ module Notes end end -Notes::QuickActionsService.prepend_if_ee('EE::Notes::QuickActionsService') +Notes::QuickActionsService.prepend_mod_with('Notes::QuickActionsService') diff --git a/app/services/notes/update_service.rb b/app/services/notes/update_service.rb index 76f9b6369b3..1cbb5916107 100644 --- a/app/services/notes/update_service.rb +++ b/app/services/notes/update_service.rb @@ -107,4 +107,4 @@ module Notes end end -Notes::UpdateService.prepend_if_ee('EE::Notes::UpdateService') +Notes::UpdateService.prepend_mod_with('Notes::UpdateService') diff --git a/app/services/notification_recipients/builder/default.rb b/app/services/notification_recipients/builder/default.rb index 19527ba84e6..58b0cd510c9 100644 --- a/app/services/notification_recipients/builder/default.rb +++ b/app/services/notification_recipients/builder/default.rb @@ -74,4 +74,4 @@ module NotificationRecipients end end -NotificationRecipients::Builder::Default.prepend_if_ee('EE::NotificationRecipients::Builder::Default') +NotificationRecipients::Builder::Default.prepend_mod_with('NotificationRecipients::Builder::Default') diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb index 8662012afdf..9dfcfe748da 100644 --- a/app/services/notification_service.rb +++ b/app/services/notification_service.rb @@ -876,4 +876,4 @@ class NotificationService end end -NotificationService.prepend_if_ee('EE::NotificationService') +NotificationService.prepend_mod_with('NotificationService') diff --git a/app/services/personal_access_tokens/create_service.rb b/app/services/personal_access_tokens/create_service.rb index 93a0135669f..7555ba26768 100644 --- a/app/services/personal_access_tokens/create_service.rb +++ b/app/services/personal_access_tokens/create_service.rb @@ -45,4 +45,4 @@ module PersonalAccessTokens end end -PersonalAccessTokens::CreateService.prepend_if_ee('EE::PersonalAccessTokens::CreateService') +PersonalAccessTokens::CreateService.prepend_mod_with('PersonalAccessTokens::CreateService') diff --git a/app/services/personal_access_tokens/revoke_service.rb b/app/services/personal_access_tokens/revoke_service.rb index 34d542acab1..0275d03bcc9 100644 --- a/app/services/personal_access_tokens/revoke_service.rb +++ b/app/services/personal_access_tokens/revoke_service.rb @@ -41,4 +41,4 @@ module PersonalAccessTokens end end -PersonalAccessTokens::RevokeService.prepend_if_ee('EE::PersonalAccessTokens::RevokeService') +PersonalAccessTokens::RevokeService.prepend_mod_with('PersonalAccessTokens::RevokeService') diff --git a/app/services/post_receive_service.rb b/app/services/post_receive_service.rb index 3dc8fd8929a..8d5cd82bcac 100644 --- a/app/services/post_receive_service.rb +++ b/app/services/post_receive_service.rb @@ -98,4 +98,4 @@ class PostReceiveService end end -PostReceiveService.prepend_if_ee('EE::PostReceiveService') +PostReceiveService.prepend_mod_with('PostReceiveService') diff --git a/app/services/preview_markdown_service.rb b/app/services/preview_markdown_service.rb index afe2651b11a..af9c338b59e 100644 --- a/app/services/preview_markdown_service.rb +++ b/app/services/preview_markdown_service.rb @@ -68,4 +68,4 @@ class PreviewMarkdownService < BaseService end end -PreviewMarkdownService.prepend_if_ee('EE::PreviewMarkdownService') +PreviewMarkdownService.prepend_mod_with('PreviewMarkdownService') diff --git a/app/services/projects/after_rename_service.rb b/app/services/projects/after_rename_service.rb index 054b358c58a..6d389035922 100644 --- a/app/services/projects/after_rename_service.rb +++ b/app/services/projects/after_rename_service.rb @@ -147,4 +147,4 @@ module Projects end end -Projects::AfterRenameService.prepend_if_ee('EE::Projects::AfterRenameService') +Projects::AfterRenameService.prepend_mod_with('Projects::AfterRenameService') diff --git a/app/services/projects/autocomplete_service.rb b/app/services/projects/autocomplete_service.rb index 68086f636b7..55f16aa3e3d 100644 --- a/app/services/projects/autocomplete_service.rb +++ b/app/services/projects/autocomplete_service.rb @@ -39,4 +39,4 @@ module Projects end end -Projects::AutocompleteService.prepend_if_ee('EE::Projects::AutocompleteService') +Projects::AutocompleteService.prepend_mod_with('Projects::AutocompleteService') diff --git a/app/services/projects/cleanup_service.rb b/app/services/projects/cleanup_service.rb index 7bcaee75813..5eafa5f9b29 100644 --- a/app/services/projects/cleanup_service.rb +++ b/app/services/projects/cleanup_service.rb @@ -108,4 +108,4 @@ module Projects end end -Projects::CleanupService.prepend_if_ee('EE::Projects::CleanupService') +Projects::CleanupService.prepend_mod_with('Projects::CleanupService') diff --git a/app/services/projects/create_from_template_service.rb b/app/services/projects/create_from_template_service.rb index 3c66ff709c9..48dda09da71 100644 --- a/app/services/projects/create_from_template_service.rb +++ b/app/services/projects/create_from_template_service.rb @@ -58,4 +58,4 @@ module Projects end end -Projects::CreateFromTemplateService.prepend_if_ee('EE::Projects::CreateFromTemplateService') +Projects::CreateFromTemplateService.prepend_mod_with('Projects::CreateFromTemplateService') diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb index 3a1fadc68c3..54a4a02a196 100644 --- a/app/services/projects/create_service.rb +++ b/app/services/projects/create_service.rb @@ -264,7 +264,7 @@ module Projects end end -Projects::CreateService.prepend_if_ee('EE::Projects::CreateService') +Projects::CreateService.prepend_mod_with('Projects::CreateService') # Measurable should be at the bottom of the ancestor chain, so it will measure execution of EE::Projects::CreateService as well Projects::CreateService.prepend(Measurable) diff --git a/app/services/projects/destroy_service.rb b/app/services/projects/destroy_service.rb index 387a2d66094..0682f3013d4 100644 --- a/app/services/projects/destroy_service.rb +++ b/app/services/projects/destroy_service.rb @@ -183,4 +183,4 @@ module Projects end end -Projects::DestroyService.prepend_if_ee('EE::Projects::DestroyService') +Projects::DestroyService.prepend_mod_with('Projects::DestroyService') diff --git a/app/services/projects/disable_deploy_key_service.rb b/app/services/projects/disable_deploy_key_service.rb index 9fb2e3398b2..e0f309875de 100644 --- a/app/services/projects/disable_deploy_key_service.rb +++ b/app/services/projects/disable_deploy_key_service.rb @@ -12,4 +12,4 @@ module Projects end end -Projects::DisableDeployKeyService.prepend_if_ee('EE::Projects::DisableDeployKeyService') +Projects::DisableDeployKeyService.prepend_mod_with('Projects::DisableDeployKeyService') diff --git a/app/services/projects/enable_deploy_key_service.rb b/app/services/projects/enable_deploy_key_service.rb index 0a24137bd61..581a6cc0ade 100644 --- a/app/services/projects/enable_deploy_key_service.rb +++ b/app/services/projects/enable_deploy_key_service.rb @@ -27,4 +27,4 @@ module Projects end end -Projects::EnableDeployKeyService.prepend_if_ee('EE::Projects::EnableDeployKeyService') +Projects::EnableDeployKeyService.prepend_mod_with('Projects::EnableDeployKeyService') diff --git a/app/services/projects/gitlab_projects_import_service.rb b/app/services/projects/gitlab_projects_import_service.rb index 38f0e2f7c1a..63a41d172ea 100644 --- a/app/services/projects/gitlab_projects_import_service.rb +++ b/app/services/projects/gitlab_projects_import_service.rb @@ -77,4 +77,4 @@ module Projects end end -Projects::GitlabProjectsImportService.prepend_if_ee('EE::Projects::GitlabProjectsImportService') +Projects::GitlabProjectsImportService.prepend_mod_with('Projects::GitlabProjectsImportService') diff --git a/app/services/projects/group_links/create_service.rb b/app/services/projects/group_links/create_service.rb index 3262839e246..d8fa2f36fcc 100644 --- a/app/services/projects/group_links/create_service.rb +++ b/app/services/projects/group_links/create_service.rb @@ -44,4 +44,4 @@ module Projects end end -Projects::GroupLinks::CreateService.prepend_if_ee('EE::Projects::GroupLinks::CreateService') +Projects::GroupLinks::CreateService.prepend_mod_with('Projects::GroupLinks::CreateService') diff --git a/app/services/projects/group_links/destroy_service.rb b/app/services/projects/group_links/destroy_service.rb index 229191e41f6..bfe704cd780 100644 --- a/app/services/projects/group_links/destroy_service.rb +++ b/app/services/projects/group_links/destroy_service.rb @@ -20,4 +20,4 @@ module Projects end end -Projects::GroupLinks::DestroyService.prepend_if_ee('EE::Projects::GroupLinks::DestroyService') +Projects::GroupLinks::DestroyService.prepend_mod_with('Projects::GroupLinks::DestroyService') diff --git a/app/services/projects/hashed_storage/migrate_attachments_service.rb b/app/services/projects/hashed_storage/migrate_attachments_service.rb index 3d9d03c4a95..023f8494d99 100644 --- a/app/services/projects/hashed_storage/migrate_attachments_service.rb +++ b/app/services/projects/hashed_storage/migrate_attachments_service.rb @@ -64,4 +64,4 @@ module Projects end end -Projects::HashedStorage::MigrateAttachmentsService.prepend_if_ee('EE::Projects::HashedStorage::MigrateAttachmentsService') +Projects::HashedStorage::MigrateAttachmentsService.prepend_mod_with('Projects::HashedStorage::MigrateAttachmentsService') diff --git a/app/services/projects/hashed_storage/migrate_repository_service.rb b/app/services/projects/hashed_storage/migrate_repository_service.rb index adc7e38e4d5..c7989e04607 100644 --- a/app/services/projects/hashed_storage/migrate_repository_service.rb +++ b/app/services/projects/hashed_storage/migrate_repository_service.rb @@ -52,4 +52,4 @@ module Projects end end -Projects::HashedStorage::MigrateRepositoryService.prepend_if_ee('EE::Projects::HashedStorage::MigrateRepositoryService') +Projects::HashedStorage::MigrateRepositoryService.prepend_mod_with('Projects::HashedStorage::MigrateRepositoryService') diff --git a/app/services/projects/import_service.rb b/app/services/projects/import_service.rb index 9879ffde60a..b5288aad6f0 100644 --- a/app/services/projects/import_service.rb +++ b/app/services/projects/import_service.rb @@ -149,7 +149,7 @@ module Projects end end -Projects::ImportService.prepend_if_ee('EE::Projects::ImportService') +Projects::ImportService.prepend_mod_with('Projects::ImportService') # Measurable should be at the bottom of the ancestor chain, so it will measure execution of EE::Projects::ImportService as well Projects::ImportService.prepend(Measurable) diff --git a/app/services/projects/operations/update_service.rb b/app/services/projects/operations/update_service.rb index 7dfe7fffa1b..c0734171ee5 100644 --- a/app/services/projects/operations/update_service.rb +++ b/app/services/projects/operations/update_service.rb @@ -135,4 +135,4 @@ module Projects end end -Projects::Operations::UpdateService.prepend_if_ee('::EE::Projects::Operations::UpdateService') +Projects::Operations::UpdateService.prepend_mod_with('Projects::Operations::UpdateService') diff --git a/app/services/projects/transfer_service.rb b/app/services/projects/transfer_service.rb index db4c022bdd4..0b7169d730f 100644 --- a/app/services/projects/transfer_service.rb +++ b/app/services/projects/transfer_service.rb @@ -229,4 +229,4 @@ module Projects end end -Projects::TransferService.prepend_if_ee('EE::Projects::TransferService') +Projects::TransferService.prepend_mod_with('Projects::TransferService') diff --git a/app/services/projects/update_pages_service.rb b/app/services/projects/update_pages_service.rb index 1ecf4beb7e2..8ea35131339 100644 --- a/app/services/projects/update_pages_service.rb +++ b/app/services/projects/update_pages_service.rb @@ -267,4 +267,4 @@ module Projects end end -Projects::UpdatePagesService.prepend_if_ee('EE::Projects::UpdatePagesService') +Projects::UpdatePagesService.prepend_mod_with('Projects::UpdatePagesService') diff --git a/app/services/projects/update_service.rb b/app/services/projects/update_service.rb index 454a80623c6..541b333aae3 100644 --- a/app/services/projects/update_service.rb +++ b/app/services/projects/update_service.rb @@ -170,4 +170,4 @@ module Projects end end -Projects::UpdateService.prepend_if_ee('EE::Projects::UpdateService') +Projects::UpdateService.prepend_mod_with('Projects::UpdateService') diff --git a/app/services/protected_branches/access_level_params.rb b/app/services/protected_branches/access_level_params.rb index e34bc23b4dc..6f7a289d9b4 100644 --- a/app/services/protected_branches/access_level_params.rb +++ b/app/services/protected_branches/access_level_params.rb @@ -34,4 +34,4 @@ module ProtectedBranches end end -ProtectedBranches::AccessLevelParams.prepend_if_ee('EE::ProtectedBranches::AccessLevelParams') +ProtectedBranches::AccessLevelParams.prepend_mod_with('ProtectedBranches::AccessLevelParams') diff --git a/app/services/protected_branches/api_service.rb b/app/services/protected_branches/api_service.rb index bf1a966472b..3e5122a1523 100644 --- a/app/services/protected_branches/api_service.rb +++ b/app/services/protected_branches/api_service.rb @@ -21,4 +21,4 @@ module ProtectedBranches end end -ProtectedBranches::ApiService.prepend_if_ee('EE::ProtectedBranches::ApiService') +ProtectedBranches::ApiService.prepend_mod_with('ProtectedBranches::ApiService') diff --git a/app/services/protected_branches/create_service.rb b/app/services/protected_branches/create_service.rb index 3c86d7d087d..37083a4a9e4 100644 --- a/app/services/protected_branches/create_service.rb +++ b/app/services/protected_branches/create_service.rb @@ -26,4 +26,4 @@ module ProtectedBranches end end -ProtectedBranches::CreateService.prepend_if_ee('EE::ProtectedBranches::CreateService') +ProtectedBranches::CreateService.prepend_mod_with('ProtectedBranches::CreateService') diff --git a/app/services/protected_branches/destroy_service.rb b/app/services/protected_branches/destroy_service.rb index acd15b0214f..dc177f0ac09 100644 --- a/app/services/protected_branches/destroy_service.rb +++ b/app/services/protected_branches/destroy_service.rb @@ -10,4 +10,4 @@ module ProtectedBranches end end -ProtectedBranches::DestroyService.prepend_if_ee('EE::ProtectedBranches::DestroyService') +ProtectedBranches::DestroyService.prepend_mod_with('ProtectedBranches::DestroyService') diff --git a/app/services/protected_branches/legacy_api_update_service.rb b/app/services/protected_branches/legacy_api_update_service.rb index 0cad23f20f7..8ff6c4bd734 100644 --- a/app/services/protected_branches/legacy_api_update_service.rb +++ b/app/services/protected_branches/legacy_api_update_service.rb @@ -49,4 +49,4 @@ module ProtectedBranches end end -ProtectedBranches::LegacyApiUpdateService.prepend_if_ee('EE::ProtectedBranches::LegacyApiUpdateService') +ProtectedBranches::LegacyApiUpdateService.prepend_mod_with('ProtectedBranches::LegacyApiUpdateService') diff --git a/app/services/protected_branches/update_service.rb b/app/services/protected_branches/update_service.rb index 226aefb64d0..1815d92421e 100644 --- a/app/services/protected_branches/update_service.rb +++ b/app/services/protected_branches/update_service.rb @@ -11,4 +11,4 @@ module ProtectedBranches end end -ProtectedBranches::UpdateService.prepend_if_ee('EE::ProtectedBranches::UpdateService') +ProtectedBranches::UpdateService.prepend_mod_with('ProtectedBranches::UpdateService') diff --git a/app/services/quick_actions/interpret_service.rb b/app/services/quick_actions/interpret_service.rb index ea90d8e3dd8..ab489ba49ca 100644 --- a/app/services/quick_actions/interpret_service.rb +++ b/app/services/quick_actions/interpret_service.rb @@ -190,4 +190,4 @@ module QuickActions end end -QuickActions::InterpretService.prepend_if_ee('EE::QuickActions::InterpretService') +QuickActions::InterpretService.prepend_mod_with('QuickActions::InterpretService') diff --git a/app/services/quick_actions/target_service.rb b/app/services/quick_actions/target_service.rb index a465632ccfb..6eda3c89e6c 100644 --- a/app/services/quick_actions/target_service.rb +++ b/app/services/quick_actions/target_service.rb @@ -37,4 +37,4 @@ module QuickActions end end -QuickActions::TargetService.prepend_if_ee('EE::QuickActions::TargetService') +QuickActions::TargetService.prepend_mod_with('QuickActions::TargetService') diff --git a/app/services/releases/base_service.rb b/app/services/releases/base_service.rb index de7c97b3518..9dd0c9a007a 100644 --- a/app/services/releases/base_service.rb +++ b/app/services/releases/base_service.rb @@ -86,4 +86,4 @@ module Releases end end -Releases::BaseService.prepend_if_ee('EE::Releases::BaseService') +Releases::BaseService.prepend_mod_with('Releases::BaseService') diff --git a/app/services/releases/create_evidence_service.rb b/app/services/releases/create_evidence_service.rb index 78b6d77c2cb..64cce45e400 100644 --- a/app/services/releases/create_evidence_service.rb +++ b/app/services/releases/create_evidence_service.rb @@ -28,4 +28,4 @@ module Releases end end -Releases::CreateEvidenceService.prepend_if_ee('EE::Releases::CreateEvidenceService') +Releases::CreateEvidenceService.prepend_mod_with('Releases::CreateEvidenceService') diff --git a/app/services/resource_access_tokens/create_service.rb b/app/services/resource_access_tokens/create_service.rb index 620dfff91e2..84f4478f20f 100644 --- a/app/services/resource_access_tokens/create_service.rb +++ b/app/services/resource_access_tokens/create_service.rb @@ -120,4 +120,4 @@ module ResourceAccessTokens end end -ResourceAccessTokens::CreateService.prepend_if_ee('EE::ResourceAccessTokens::CreateService') +ResourceAccessTokens::CreateService.prepend_mod_with('ResourceAccessTokens::CreateService') diff --git a/app/services/resource_access_tokens/revoke_service.rb b/app/services/resource_access_tokens/revoke_service.rb index 0924ca3bac4..9543ea4b68d 100644 --- a/app/services/resource_access_tokens/revoke_service.rb +++ b/app/services/resource_access_tokens/revoke_service.rb @@ -67,4 +67,4 @@ module ResourceAccessTokens end end -ResourceAccessTokens::RevokeService.prepend_if_ee('EE::ResourceAccessTokens::RevokeService') +ResourceAccessTokens::RevokeService.prepend_mod_with('ResourceAccessTokens::RevokeService') diff --git a/app/services/resource_events/change_labels_service.rb b/app/services/resource_events/change_labels_service.rb index 89eb90e9360..3797d41a5df 100644 --- a/app/services/resource_events/change_labels_service.rb +++ b/app/services/resource_events/change_labels_service.rb @@ -44,4 +44,4 @@ module ResourceEvents end end -ResourceEvents::ChangeLabelsService.prepend_if_ee('EE::ResourceEvents::ChangeLabelsService') +ResourceEvents::ChangeLabelsService.prepend_mod_with('ResourceEvents::ChangeLabelsService') diff --git a/app/services/resource_events/merge_into_notes_service.rb b/app/services/resource_events/merge_into_notes_service.rb index 122bcb8550f..ea465c1e75e 100644 --- a/app/services/resource_events/merge_into_notes_service.rb +++ b/app/services/resource_events/merge_into_notes_service.rb @@ -37,4 +37,4 @@ module ResourceEvents end end -ResourceEvents::MergeIntoNotesService.prepend_if_ee('EE::ResourceEvents::MergeIntoNotesService') +ResourceEvents::MergeIntoNotesService.prepend_mod_with('ResourceEvents::MergeIntoNotesService') diff --git a/app/services/search/global_service.rb b/app/services/search/global_service.rb index 055034d87a1..661aafc70cd 100644 --- a/app/services/search/global_service.rb +++ b/app/services/search/global_service.rb @@ -38,4 +38,4 @@ module Search end end -Search::GlobalService.prepend_if_ee('EE::Search::GlobalService') +Search::GlobalService.prepend_mod_with('Search::GlobalService') diff --git a/app/services/search/group_service.rb b/app/services/search/group_service.rb index 4b2d8499582..daed0df83f3 100644 --- a/app/services/search/group_service.rb +++ b/app/services/search/group_service.rb @@ -31,4 +31,4 @@ module Search end end -Search::GroupService.prepend_if_ee('EE::Search::GroupService') +Search::GroupService.prepend_mod_with('Search::GroupService') diff --git a/app/services/search/project_service.rb b/app/services/search/project_service.rb index 4227dfe2fac..3181c0098cc 100644 --- a/app/services/search/project_service.rb +++ b/app/services/search/project_service.rb @@ -37,4 +37,4 @@ module Search end end -Search::ProjectService.prepend_if_ee('EE::Search::ProjectService') +Search::ProjectService.prepend_mod_with('Search::ProjectService') diff --git a/app/services/search/snippet_service.rb b/app/services/search/snippet_service.rb index 30401b28571..b629fd305d7 100644 --- a/app/services/search/snippet_service.rb +++ b/app/services/search/snippet_service.rb @@ -12,4 +12,4 @@ module Search end end -Search::SnippetService.prepend_if_ee('::EE::Search::SnippetService') +Search::SnippetService.prepend_mod_with('Search::SnippetService') diff --git a/app/services/search_service.rb b/app/services/search_service.rb index 84d7e33c3d0..389cf17e115 100644 --- a/app/services/search_service.rb +++ b/app/services/search_service.rb @@ -140,4 +140,4 @@ class SearchService attr_reader :current_user, :params end -SearchService.prepend_if_ee('EE::SearchService') +SearchService.prepend_mod_with('SearchService') diff --git a/app/services/snippets/destroy_service.rb b/app/services/snippets/destroy_service.rb index 9bd74306cab..96157434462 100644 --- a/app/services/snippets/destroy_service.rb +++ b/app/services/snippets/destroy_service.rb @@ -59,4 +59,4 @@ module Snippets end end -Snippets::DestroyService.prepend_if_ee('EE::Snippets::DestroyService') +Snippets::DestroyService.prepend_mod_with('Snippets::DestroyService') diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb index 4377bd8554b..56a6244eebf 100644 --- a/app/services/system_note_service.rb +++ b/app/services/system_note_service.rb @@ -338,4 +338,4 @@ module SystemNoteService end end -SystemNoteService.prepend_if_ee('EE::SystemNoteService') +SystemNoteService.prepend_mod_with('SystemNoteService') diff --git a/app/services/system_notes/issuables_service.rb b/app/services/system_notes/issuables_service.rb index a44a3d3f1b9..ae4f65e785c 100644 --- a/app/services/system_notes/issuables_service.rb +++ b/app/services/system_notes/issuables_service.rb @@ -420,4 +420,4 @@ module SystemNotes end end -SystemNotes::IssuablesService.prepend_if_ee('::EE::SystemNotes::IssuablesService') +SystemNotes::IssuablesService.prepend_mod_with('SystemNotes::IssuablesService') diff --git a/app/services/todo_service.rb b/app/services/todo_service.rb index 68e2af93be1..fc6543a8efc 100644 --- a/app/services/todo_service.rb +++ b/app/services/todo_service.rb @@ -371,4 +371,4 @@ class TodoService end end -TodoService.prepend_if_ee('EE::TodoService') +TodoService.prepend_mod_with('TodoService') diff --git a/app/services/todos/destroy/entity_leave_service.rb b/app/services/todos/destroy/entity_leave_service.rb index 94f8926f93f..dfe14225ade 100644 --- a/app/services/todos/destroy/entity_leave_service.rb +++ b/app/services/todos/destroy/entity_leave_service.rb @@ -143,4 +143,4 @@ module Todos end end -Todos::Destroy::EntityLeaveService.prepend_if_ee('EE::Todos::Destroy::EntityLeaveService') +Todos::Destroy::EntityLeaveService.prepend_mod_with('Todos::Destroy::EntityLeaveService') diff --git a/app/services/user_project_access_changed_service.rb b/app/services/user_project_access_changed_service.rb index 11727f05f35..80490bd4c9a 100644 --- a/app/services/user_project_access_changed_service.rb +++ b/app/services/user_project_access_changed_service.rb @@ -26,4 +26,4 @@ class UserProjectAccessChangedService end end -UserProjectAccessChangedService.prepend_if_ee('EE::UserProjectAccessChangedService') +UserProjectAccessChangedService.prepend_mod_with('UserProjectAccessChangedService') diff --git a/app/services/users/activity_service.rb b/app/services/users/activity_service.rb index 64844a3f002..c89a286cc8b 100644 --- a/app/services/users/activity_service.rb +++ b/app/services/users/activity_service.rb @@ -38,4 +38,4 @@ module Users end end -Users::ActivityService.prepend_ee_mod +Users::ActivityService.prepend_mod diff --git a/app/services/users/approve_service.rb b/app/services/users/approve_service.rb index fea7fc55d90..15486ddcd43 100644 --- a/app/services/users/approve_service.rb +++ b/app/services/users/approve_service.rb @@ -47,4 +47,4 @@ module Users end end -Users::ApproveService.prepend_if_ee('EE::Users::ApproveService') +Users::ApproveService.prepend_mod_with('Users::ApproveService') diff --git a/app/services/users/block_service.rb b/app/services/users/block_service.rb index 8513664ee85..37921c477b4 100644 --- a/app/services/users/block_service.rb +++ b/app/services/users/block_service.rb @@ -26,4 +26,4 @@ module Users end end -Users::BlockService.prepend_if_ee('EE::Users::BlockService') +Users::BlockService.prepend_mod_with('Users::BlockService') diff --git a/app/services/users/build_service.rb b/app/services/users/build_service.rb index c49e39300d4..649cf281ab0 100644 --- a/app/services/users/build_service.rb +++ b/app/services/users/build_service.rb @@ -162,4 +162,4 @@ module Users end end -Users::BuildService.prepend_if_ee('EE::Users::BuildService') +Users::BuildService.prepend_mod_with('Users::BuildService') diff --git a/app/services/users/create_service.rb b/app/services/users/create_service.rb index ec8b3cea664..757ebd783ee 100644 --- a/app/services/users/create_service.rb +++ b/app/services/users/create_service.rb @@ -26,4 +26,4 @@ module Users end end -Users::CreateService.prepend_if_ee('EE::Users::CreateService') +Users::CreateService.prepend_mod_with('Users::CreateService') diff --git a/app/services/users/destroy_service.rb b/app/services/users/destroy_service.rb index 63a02ebede5..4ec875098fa 100644 --- a/app/services/users/destroy_service.rb +++ b/app/services/users/destroy_service.rb @@ -73,4 +73,4 @@ module Users end end -Users::DestroyService.prepend_if_ee('EE::Users::DestroyService') +Users::DestroyService.prepend_mod_with('Users::DestroyService') diff --git a/app/services/users/migrate_to_ghost_user_service.rb b/app/services/users/migrate_to_ghost_user_service.rb index 1b46edd4d7d..a471f55e644 100644 --- a/app/services/users/migrate_to_ghost_user_service.rb +++ b/app/services/users/migrate_to_ghost_user_service.rb @@ -93,4 +93,4 @@ module Users end end -Users::MigrateToGhostUserService.prepend_if_ee('EE::Users::MigrateToGhostUserService') +Users::MigrateToGhostUserService.prepend_mod_with('Users::MigrateToGhostUserService') diff --git a/app/services/users/reject_service.rb b/app/services/users/reject_service.rb index 0e3eb3e5dde..833c30d9427 100644 --- a/app/services/users/reject_service.rb +++ b/app/services/users/reject_service.rb @@ -39,4 +39,4 @@ module Users end end -Users::RejectService.prepend_if_ee('EE::Users::RejectService') +Users::RejectService.prepend_mod_with('Users::RejectService') diff --git a/app/services/users/update_service.rb b/app/services/users/update_service.rb index ef68fb9a537..ff08c806319 100644 --- a/app/services/users/update_service.rb +++ b/app/services/users/update_service.rb @@ -96,4 +96,4 @@ module Users end end -Users::UpdateService.prepend_if_ee('EE::Users::UpdateService') +Users::UpdateService.prepend_mod_with('Users::UpdateService') diff --git a/app/services/wiki_pages/base_service.rb b/app/services/wiki_pages/base_service.rb index fd234630633..4ec884469eb 100644 --- a/app/services/wiki_pages/base_service.rb +++ b/app/services/wiki_pages/base_service.rb @@ -61,4 +61,4 @@ module WikiPages end end -WikiPages::BaseService.prepend_if_ee('EE::WikiPages::BaseService') +WikiPages::BaseService.prepend_mod_with('WikiPages::BaseService') |