Merge branch 'bw-fix-checking-disabled-services' into 'master'51761-create-new-project-auto-populate-project-slug-string-to-project-name-if-name-is-empty34758-split-create-gcp-controller

Check disabled_services when finding a service

See merge request gitlab-org/gitlab-ce!22172

1 files changed, 3 insertions, 3 deletions

diff --git a/app/models/project.rb b/app/models/project.rb
index 3fa47c1cda3..0cdd876dc20 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1088,9 +1088,7 @@ class Project < ActiveRecord::Base
       find_or_initialize_service(service_name)
     end
 
-    available_services.reject do |service|
-      disabled_services.include?(service.to_param)
-    end
+    available_services.compact
   end
 
   def disabled_services
@@ -1098,6 +1096,8 @@ class Project < ActiveRecord::Base
   end
 
   def find_or_initialize_service(name)
+    return if disabled_services.include?(name)
+
     service = find_service(services, name)
     return service if service