Merge branch 'backport-exceptions-argument' into 'master'

Allow passing exceptions when creating project services

See merge request !12745

1 files changed, 4 insertions, 2 deletions

diff --git a/app/models/project.rb b/app/models/project.rb
index d0e02e4e585..d5760164663 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -801,10 +801,12 @@ class Project < ActiveRecord::Base
     update_column(:has_external_wiki, services.external_wikis.any?)
   end
 
-  def find_or_initialize_services
+  def find_or_initialize_services(exceptions: [])
     services_templates = Service.where(template: true)
 
-    Service.available_services_names.map do |service_name|
+    available_services_names = Service.available_services_names - exceptions
+
+    available_services_names.map do |service_name|
       service = find_service(services, service_name)
 
       if service