Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

1 files changed, 6 insertions, 6 deletions

diff --git a/app/graphql/resolvers/projects/services_resolver.rb b/app/graphql/resolvers/projects/services_resolver.rb
index db3037ec591..3674aa97e1f 100644
--- a/app/graphql/resolvers/projects/services_resolver.rb
+++ b/app/graphql/resolvers/projects/services_resolver.rb
@@ -12,19 +12,19 @@ module Resolvers
       argument :active,
                GraphQL::BOOLEAN_TYPE,
                required: false,
-               description: 'Indicates if the service is active.'
+               description: 'Indicates if the integration is active.'
       argument :type,
                Types::Projects::ServiceTypeEnum,
                required: false,
-               description: 'Class name of the service.'
+               description: 'Type of integration.'
 
       alias_method :project, :object
 
       def resolve(active: nil, type: nil)
-        servs = project.integrations
-        servs = servs.by_active_flag(active) unless active.nil?
-        servs = servs.by_type(type) unless type.blank?
-        servs
+        items = project.integrations
+        items = items.by_active_flag(active) unless active.nil?
+        items = items.by_type(type) unless type.blank?
+        items
       end
     end
   end