Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-05-16 21:39:29 +0300
committerRémy Coutable <remy@rymai.me>2018-05-16 21:39:29 +0300
commit8d024ba79a2e2a2f2d34f4ee678b496f0fbe64f9 (patch)
treee26b5fd39c31ad170e0059aa3106bfbb1d7f5aac /app/models/project.rb
parent6d81905fafb23f20520eb5ffa46c94b18ccc8686 (diff)
Backport changes from EE to minimize the CE/EE diff in Projects::Settings::IntegrationsController
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/models/project.rb')
-rw-r--r--app/models/project.rb10
1 files changed, 9 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index 534a0e630af..107ee5f9a7e 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -998,7 +998,7 @@ class Project < ActiveRecord::Base
available_services_names = Service.available_services_names - exceptions
- available_services_names.map do |service_name|
+ available_services = available_services_names.map do |service_name|
service = find_service(services, service_name)
if service
@@ -1015,6 +1015,14 @@ class Project < ActiveRecord::Base
end
end
end
+
+ available_services.reject do |service|
+ disabled_services.include?(service.to_param)
+ end
+ end
+
+ def disabled_services
+ []
end
def find_or_initialize_service(name)