Add latest changes from gitlab-org/gitlab@13-1-stable-ee

1 files changed, 8 insertions, 3 deletions

diff --git a/app/graphql/types/projects/services/jira_service_type.rb b/app/graphql/types/projects/services/jira_service_type.rb
index 4fd9e61f5a4..e81963f752d 100644
--- a/app/graphql/types/projects/services/jira_service_type.rb
+++ b/app/graphql/types/projects/services/jira_service_type.rb
@@ -9,9 +9,14 @@ module Types
         implements(Types::Projects::ServiceType)
 
         authorize :admin_project
-        # This is a placeholder for now for the actuall implementation of the JiraServiceType
-        # Here we will want to expose a field with jira_projects fetched through Jira Rest API
-        # MR implementing it https://gitlab.com/gitlab-org/gitlab/-/merge_requests/28190
+
+        field :projects,
+              Types::Projects::Services::JiraProjectType.connection_type,
+              null: true,
+              connection: false,
+              extensions: [Gitlab::Graphql::Extensions::ExternallyPaginatedArrayExtension],
+              description: 'List of Jira projects fetched through Jira REST API',
+              resolver: Resolvers::Projects::JiraProjectsResolver
       end
     end
   end