Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 7 deletions

diff --git a/app/models/project.rb b/app/models/project.rb
index b5639039bb6..44701ef792a 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1224,13 +1224,13 @@ class Project < ApplicationRecord
     service = find_service(services, name)
     return service if service
 
-    # We should check if an instance-level service exists
-    instance_level_service = find_service(instance_level_services, name)
+    # We should check if template for the service exists
+    template = find_service(services_templates, name)
 
-    if instance_level_service
-      Service.build_from_instance(id, instance_level_service)
+    if template
+      Service.build_from_template(id, template)
     else
-      # If no instance-level service exists, we should create a new service. Ex `build_gitlab_ci_service`
+      # If no template, we should create an instance. Ex `build_gitlab_ci_service`
       public_send("build_#{name}_service") # rubocop:disable GitlabSecurity/PublicSend
     end
   end
@@ -2460,8 +2460,8 @@ class Project < ApplicationRecord
     end
   end
 
-  def instance_level_services
-    @instance_level_services ||= Service.where(instance: true)
+  def services_templates
+    @services_templates ||= Service.where(template: true)
   end
 
   def ensure_pages_metadatum