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

Allow passing exceptions when creating project services See merge request !12745

Merge branch 'backport-exceptions-argument' into 'master'
3ea0ac9a · Rémy Coutable · b0cb64a1 · 8947232b · 3ea0ac9a
Commit 3ea0ac9a authored Jul 10, 2017 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

project.rb app/models/project.rb +4 -2

No files found.
--- 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