Add latest changes from gitlab-org/gitlab@master

16 files changed, 32 insertions, 0 deletions

diff --git a/app/services/projects/after_rename_service.rb b/app/services/projects/after_rename_service.rb
index fafdecb3222..2a35a07d555 100644
--- a/app/services/projects/after_rename_service.rb
+++ b/app/services/projects/after_rename_service.rb
@@ -139,3 +139,5 @@ module Projects
     end
   end
 end
+
+Projects::AfterRenameService.prepend_if_ee('EE::Projects::AfterRenameService')
diff --git a/app/services/projects/autocomplete_service.rb b/app/services/projects/autocomplete_service.rb
index 3dad90188cf..53bd954eab6 100644
--- a/app/services/projects/autocomplete_service.rb
+++ b/app/services/projects/autocomplete_service.rb
@@ -38,3 +38,5 @@ module Projects
     end
   end
 end
+
+Projects::AutocompleteService.prepend_if_ee('EE::Projects::AutocompleteService')
diff --git a/app/services/projects/cleanup_service.rb b/app/services/projects/cleanup_service.rb
index 5972bfd4071..9b4114ff42f 100644
--- a/app/services/projects/cleanup_service.rb
+++ b/app/services/projects/cleanup_service.rb
@@ -89,3 +89,5 @@ module Projects
     end
   end
 end
+
+Projects::CleanupService.prepend_if_ee('EE::Projects::CleanupService')
diff --git a/app/services/projects/create_from_template_service.rb b/app/services/projects/create_from_template_service.rb
index 678bc0d24c3..31977a7c76a 100644
--- a/app/services/projects/create_from_template_service.rb
+++ b/app/services/projects/create_from_template_service.rb
@@ -26,3 +26,5 @@ module Projects
     end
   end
 end
+
+Projects::CreateFromTemplateService.prepend_if_ee('EE::Projects::CreateFromTemplateService')
diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb
index 942a45286b2..728eb039b54 100644
--- a/app/services/projects/create_service.rb
+++ b/app/services/projects/create_service.rb
@@ -199,3 +199,5 @@ module Projects
     end
   end
 end
+
+Projects::CreateService.prepend_if_ee('EE::Projects::CreateService')
diff --git a/app/services/projects/destroy_service.rb b/app/services/projects/destroy_service.rb
index 108c4a79cde..5fdf98c3c5e 100644
--- a/app/services/projects/destroy_service.rb
+++ b/app/services/projects/destroy_service.rb
@@ -228,3 +228,5 @@ module Projects
     end
   end
 end
+
+Projects::DestroyService.prepend_if_ee('EE::Projects::DestroyService')
diff --git a/app/services/projects/disable_deploy_key_service.rb b/app/services/projects/disable_deploy_key_service.rb
index e483c0708c4..9fb2e3398b2 100644
--- a/app/services/projects/disable_deploy_key_service.rb
+++ b/app/services/projects/disable_deploy_key_service.rb
@@ -11,3 +11,5 @@ module Projects
     end
   end
 end
+
+Projects::DisableDeployKeyService.prepend_if_ee('EE::Projects::DisableDeployKeyService')
diff --git a/app/services/projects/enable_deploy_key_service.rb b/app/services/projects/enable_deploy_key_service.rb
index 38219cacee9..0a24137bd61 100644
--- a/app/services/projects/enable_deploy_key_service.rb
+++ b/app/services/projects/enable_deploy_key_service.rb
@@ -26,3 +26,5 @@ module Projects
     end
   end
 end
+
+Projects::EnableDeployKeyService.prepend_if_ee('EE::Projects::EnableDeployKeyService')
diff --git a/app/services/projects/gitlab_projects_import_service.rb b/app/services/projects/gitlab_projects_import_service.rb
index a315adf42f0..234ebbc6651 100644
--- a/app/services/projects/gitlab_projects_import_service.rb
+++ b/app/services/projects/gitlab_projects_import_service.rb
@@ -69,3 +69,5 @@ module Projects
     end
   end
 end
+
+Projects::GitlabProjectsImportService.prepend_if_ee('EE::Projects::GitlabProjectsImportService')
diff --git a/app/services/projects/group_links/create_service.rb b/app/services/projects/group_links/create_service.rb
index e3d5bea0852..241948b335b 100644
--- a/app/services/projects/group_links/create_service.rb
+++ b/app/services/projects/group_links/create_service.rb
@@ -21,3 +21,5 @@ module Projects
     end
   end
 end
+
+Projects::GroupLinks::CreateService.prepend_if_ee('EE::Projects::GroupLinks::CreateService')
diff --git a/app/services/projects/group_links/destroy_service.rb b/app/services/projects/group_links/destroy_service.rb
index 8aefad048ce..c96dcaae8d5 100644
--- a/app/services/projects/group_links/destroy_service.rb
+++ b/app/services/projects/group_links/destroy_service.rb
@@ -11,3 +11,5 @@ module Projects
     end
   end
 end
+
+Projects::GroupLinks::DestroyService.prepend_if_ee('EE::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 affe6e5668d..0cbff283102 100644
--- a/app/services/projects/hashed_storage/migrate_attachments_service.rb
+++ b/app/services/projects/hashed_storage/migrate_attachments_service.rb
@@ -37,3 +37,5 @@ module Projects
     end
   end
 end
+
+Projects::HashedStorage::MigrateAttachmentsService.prepend_if_ee('EE::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 e8393128d58..e248a13c702 100644
--- a/app/services/projects/hashed_storage/migrate_repository_service.rb
+++ b/app/services/projects/hashed_storage/migrate_repository_service.rb
@@ -38,3 +38,5 @@ module Projects
     end
   end
 end
+
+Projects::HashedStorage::MigrateRepositoryService.prepend_if_ee('EE::Projects::HashedStorage::MigrateRepositoryService')
diff --git a/app/services/projects/operations/update_service.rb b/app/services/projects/operations/update_service.rb
index 48eddb0e8d0..dd72c2844c2 100644
--- a/app/services/projects/operations/update_service.rb
+++ b/app/services/projects/operations/update_service.rb
@@ -47,3 +47,5 @@ module Projects
     end
   end
 end
+
+Projects::Operations::UpdateService.prepend_if_ee('::EE::Projects::Operations::UpdateService')
diff --git a/app/services/projects/transfer_service.rb b/app/services/projects/transfer_service.rb
index 078a751025f..4b3aca58dd7 100644
--- a/app/services/projects/transfer_service.rb
+++ b/app/services/projects/transfer_service.rb
@@ -168,3 +168,5 @@ module Projects
     end
   end
 end
+
+Projects::TransferService.prepend_if_ee('EE::Projects::TransferService')
diff --git a/app/services/projects/update_service.rb b/app/services/projects/update_service.rb
index 8acbdc7e02b..51a6f62e597 100644
--- a/app/services/projects/update_service.rb
+++ b/app/services/projects/update_service.rb
@@ -139,3 +139,5 @@ module Projects
     end
   end
 end
+
+Projects::UpdateService.prepend_if_ee('EE::Projects::UpdateService')