Add latest changes from gitlab-org/gitlab@master

4 files changed, 8 insertions, 0 deletions

diff --git a/app/services/users/build_service.rb b/app/services/users/build_service.rb
index 026bcfcdaf4..8c85ad9ffd8 100644
--- a/app/services/users/build_service.rb
+++ b/app/services/users/build_service.rb
@@ -125,3 +125,5 @@ module Users
     end
   end
 end
+
+Users::BuildService.prepend_if_ee('EE::Users::BuildService')
diff --git a/app/services/users/destroy_service.rb b/app/services/users/destroy_service.rb
index 73fa6089945..e341c7f0537 100644
--- a/app/services/users/destroy_service.rb
+++ b/app/services/users/destroy_service.rb
@@ -64,3 +64,5 @@ module Users
     end
   end
 end
+
+Users::DestroyService.prepend_if_ee('EE::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 a66b6627e40..e7186fdfb63 100644
--- a/app/services/users/migrate_to_ghost_user_service.rb
+++ b/app/services/users/migrate_to_ghost_user_service.rb
@@ -81,3 +81,5 @@ module Users
     end
   end
 end
+
+Users::MigrateToGhostUserService.prepend_if_ee('EE::Users::MigrateToGhostUserService')
diff --git a/app/services/users/update_service.rb b/app/services/users/update_service.rb
index 8f52e9cb23f..eea5ff6e5db 100644
--- a/app/services/users/update_service.rb
+++ b/app/services/users/update_service.rb
@@ -80,3 +80,5 @@ module Users
     end
   end
 end
+
+Users::UpdateService.prepend_if_ee('EE::Users::UpdateService')