Refactored objects to return field type and connnection

doc/api/graphql/reference/index.md

@@ -1318,7 +1318,7 @@ Autogenerated return type of EpicTreeReorder.
 | `avatarUrl` | String | Avatar URL of the group |
 | `board` | Board | A single board of the group |
 | `boards` | BoardConnection | Boards of the group |
-| `codeCoverageActivities` | CodeCoverageActivityConnection | Represents the code coverage activity for this group. Available only when feature flag `group_coverage_data_report` is enabled |
+| `codeCoverageActivities` | CodeCoverageActivityConnection | Represents the code coverage activity for this group. Available only when feature flag `group_coverage_data_report_graph` is enabled |
 | `containerRepositories` | ContainerRepositoryConnection | Container repositories of the project |
 | `containsLockedProjects` | Boolean! | Includes at least one project where the repository size exceeds the limit |
 | `description` | String | Description of the namespace |
@@ -2099,24 +2099,19 @@ Information about pagination in a connection..
 | `coverage` | Float | Coverage percentage |
 | `createdAt` | Time! | Timestamp of the pipeline's creation |
 | `detailedStatus` | DetailedStatus! | Detailed status of the pipeline |
+| `downstream` | PipelineConnection | Pipelines this pipeline will trigger |
 | `duration` | Int | Duration of the pipeline in seconds |
 | `finishedAt` | Time | Timestamp of the pipeline's completion |
 | `id` | ID! | ID of the pipeline |
 | `iid` | String! | Internal ID of the pipeline |
-<<<<<<< HEAD
+| `jobs` | CiJobConnection | Jobs belonging to the pipeline |
 | `path` | String | Relative path to the pipeline's page |
 | `project` | Project | Project the pipeline belongs to |
 | `retryable` | Boolean! | Specifies if a pipeline can be retried |
 | `securityReportSummary` | SecurityReportSummary | Vulnerability and scanned resource counts for each security scanner of the pipeline |
 | `sha` | String! | SHA of the pipeline's commit |
 | `sourceJob` | CiJob | Job where pipeline was triggered from |
-=======
-| `jobs` | CiJobConnection | Jobs belonging to the pipeline |
-| `retryable` | Boolean! | Specifies if a pipeline can be retried |
-| `securityReportSummary` | SecurityReportSummary | Vulnerability and scanned resource counts for each security scanner of the pipeline |
-| `sha` | String! | SHA of the pipeline's commit |
 | `stages` | CiStageConnection | Stages of the pipeline |
->>>>>>> 072fb0a2712 (Updates template to include connnection fields)
 | `startedAt` | Time | Timestamp when the pipeline was started |
 | `status` | PipelineStatusEnum! | Status of the pipeline (CREATED, WAITING_FOR_RESOURCE, PREPARING, PENDING, RUNNING, FAILED, SUCCESS, CANCELED, SKIPPED, MANUAL, SCHEDULED) |
 | `updatedAt` | Time! | Timestamp of the pipeline's last activity |

lib/gitlab/graphql/docs/helper.rb

@@ -85,6 +85,8 @@ module Gitlab
             !object_type[:name]["Connection"] &&
               !object_type[:name]["Edge"] &&
               !object_type[:name]["__"]
+          end.each do |type|
+            type[:fields] += type[:connections]
           end
         end
 

lib/gitlab/graphql/docs/templates/default.md.haml

@@ -30,12 +30,11 @@
 \
 
 - objects.each do |type|
-  - all_fields = type[:fields] + type[:connections]
-  - unless all_fields.empty?
+  - unless type[:fields].empty?
     = render_name_and_description(type)
     ~ "| Field | Type | Description |"
     ~ "| ----- | ---- | ----------- |"
-    - sorted_by_name(all_fields).each do |field|
+    - sorted_by_name(type[:fields]).each do |field|
       = render_field(field)
     \