Add latest changes from gitlab-org/gitlab@master

6 files changed, 6 insertions, 6 deletions

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')