diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-07-10 11:13:48 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-07-10 11:13:48 +0000 |
| commit | 3ea0ac9a7466f62b8ab82fbd98443ef2b6212c74 (patch) | |
| tree | bc3f05dffeebd1386676f55074da4becac7848b0 /app/models | |
| parent | b0cb64a171dbc0c91ddf00dc65656efd9ce3a7ad (diff) | |
| parent | 8947232be7e39d5da12b1cf72e80d68fa2188464 (diff) | |
| download | gitlab-ce-3ea0ac9a7466f62b8ab82fbd98443ef2b6212c74.tar.gz | |
Merge branch 'backport-exceptions-argument' into 'master'
Allow passing exceptions when creating project services
See merge request !12745
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/project.rb | 6 |
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 |