5 files changed, 46 insertions, 8 deletions
diff --git a/app/graphql/types/ci/config/config_type.rb b/app/graphql/types/ci/config/config_type.rb
index e54b345f3d3..29093c6d3c9 100644
--- a/app/graphql/types/ci/config/config_type.rb
+++ b/app/graphql/types/ci/config/config_type.rb
@@ -11,7 +11,7 @@ module Types
               description: 'Linting errors'
         field :merged_yaml, GraphQL::STRING_TYPE, null: true,
               description: 'Merged CI config YAML'
-        field :stages, [Types::Ci::Config::StageType], null: true,
+        field :stages, Types::Ci::Config::StageType.connection_type, null: true,
               description: 'Stages of the pipeline'
         field :status, Types::Ci::Config::StatusEnum, null: true,
               description: 'Status of linting, can be either valid or invalid'
diff --git a/app/graphql/types/ci/config/group_type.rb b/app/graphql/types/ci/config/group_type.rb
index 8b0db2934a4..8e133bbcba8 100644
--- a/app/graphql/types/ci/config/group_type.rb
+++ b/app/graphql/types/ci/config/group_type.rb
@@ -9,7 +9,7 @@ module Types
 
         field :name, GraphQL::STRING_TYPE, null: true,
               description: 'Name of the job group'
-        field :jobs, [Types::Ci::Config::JobType], null: true,
+        field :jobs, Types::Ci::Config::JobType.connection_type, null: true,
               description: 'Jobs in group'
         field :size, GraphQL::INT_TYPE, null: true,
               description: 'Size of the job group'
diff --git a/app/graphql/types/ci/config/job_restriction_type.rb b/app/graphql/types/ci/config/job_restriction_type.rb
new file mode 100644
index 00000000000..294e3c94571
--- /dev/null
+++ b/app/graphql/types/ci/config/job_restriction_type.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Types
+  module Ci
+    # rubocop: disable Graphql/AuthorizeTypes
+    module Config
+      class JobRestrictionType < BaseObject
+        graphql_name 'CiConfigJobRestriction'
+
+        field :refs, [GraphQL::STRING_TYPE], null: true,
+              description: 'The Git refs the job restriction applies to.'
+      end
+    end
+  end
+end
diff --git a/app/graphql/types/ci/config/job_type.rb b/app/graphql/types/ci/config/job_type.rb
index 59bcbd9ef49..65fdc4c2615 100644
--- a/app/graphql/types/ci/config/job_type.rb
+++ b/app/graphql/types/ci/config/job_type.rb
@@ -8,13 +8,36 @@ module Types
         graphql_name 'CiConfigJob'
 
         field :name, GraphQL::STRING_TYPE, null: true,
-              description: 'Name of the job'
+              description: 'Name of the job.'
         field :group_name, GraphQL::STRING_TYPE, null: true,
-              description: 'Name of the job group'
+              description: 'Name of the job group.'
         field :stage, GraphQL::STRING_TYPE, null: true,
-              description: 'Name of the job stage'
-        field :needs, [Types::Ci::Config::NeedType], null: true,
-              description: 'Builds that must complete before the jobs run'
+              description: 'Name of the job stage.'
+        field :needs, Types::Ci::Config::NeedType.connection_type, null: true,
+              description: 'Builds that must complete before the jobs run.'
+        field :allow_failure, GraphQL::BOOLEAN_TYPE, null: true,
+              description:  'Allow job to fail.'
+        field :before_script, [GraphQL::STRING_TYPE], null: true,
+              description: 'Override a set of commands that are executed before the job.'
+        field :script, [GraphQL::STRING_TYPE], null: true,
+              description: 'Shell script that is executed by a runner.'
+        field :after_script, [GraphQL::STRING_TYPE], null: true,
+              description: 'Override a set of commands that are executed after the job.'
+        field :when, GraphQL::STRING_TYPE, null: true,
+              description: 'When to run the job.',
+              resolver_method: :restrict_when_to_run_jobs
+        field :environment, GraphQL::STRING_TYPE, null: true,
+              description: 'Name of an environment to which the job deploys.'
+        field :except, Types::Ci::Config::JobRestrictionType, null: true,
+              description: 'Limit when jobs are not created.'
+        field :only, Types::Ci::Config::JobRestrictionType, null: true,
+               description: 'Jobs are created when these conditions do not apply.'
+        field :tags, [GraphQL::STRING_TYPE], null: true,
+              description: 'List of tags that are used to select a runner.'
+
+        def restrict_when_to_run_jobs
+          object[:when]
+        end
       end
     end
   end
diff --git a/app/graphql/types/ci/config/stage_type.rb b/app/graphql/types/ci/config/stage_type.rb
index 20618bc41f8..2008c553629 100644
--- a/app/graphql/types/ci/config/stage_type.rb
+++ b/app/graphql/types/ci/config/stage_type.rb
@@ -9,7 +9,7 @@ module Types
 
         field :name, GraphQL::STRING_TYPE, null: true,
               description: 'Name of the stage'
-        field :groups, [Types::Ci::Config::GroupType], null: true,
+        field :groups, Types::Ci::Config::GroupType.connection_type, null: true,
               description: 'Groups of jobs for the stage'
       end
     end