Automatic merge of gitlab-org/gitlab master

.haml-lint.yml

@@ -110,7 +110,6 @@ linters:
       - GitlabSecurity/PublicSend
       - Layout/EmptyLineAfterGuardClause
       - Layout/LeadingCommentSpace
-      - Layout/SpaceAfterColon
       - Layout/SpaceAroundOperators
       - Layout/SpaceBeforeBlockBraces
       - Layout/SpaceBeforeComma

app/graphql/types/ci/pipeline_status_enum.rb

@@ -4,7 +4,9 @@ module Types
   module Ci
     class PipelineStatusEnum < BaseEnum
       ::Ci::Pipeline.all_state_names.each do |state_symbol|
-        value state_symbol.to_s.upcase, value: state_symbol.to_s
+        value state_symbol.to_s.upcase,
+              description: ::Ci::Pipeline::STATUSES_DESCRIPTION[state_symbol],
+              value: state_symbol.to_s
       end
     end
   end

app/models/concerns/ci/has_status.rb

@@ -16,6 +16,19 @@ module Ci
     STATUSES_ENUM = { created: 0, pending: 1, running: 2, success: 3,
                       failed: 4, canceled: 5, skipped: 6, manual: 7,
                       scheduled: 8, preparing: 9, waiting_for_resource: 10 }.freeze
+    STATUSES_DESCRIPTION = {
+      created: 'Pipeline has been created',
+      waiting_for_resource: 'A resource (for example, a runner) that the pipeline requires to run is unavailable',
+      preparing: 'Pipeline is preparing to run',
+      pending: 'Pipeline has not started running yet',
+      running: 'Pipeline is running',
+      failed: 'At least one stage of the pipeline failed',
+      success: 'Pipeline completed successfully',
+      canceled: 'Pipeline was canceled before completion',
+      skipped: 'Pipeline was skipped',
+      manual: 'Pipeline needs to be manually started',
+      scheduled: 'Pipeline is scheduled to run'
+    }.freeze
 
     UnknownStatusError = Class.new(StandardError)
 

changelogs/unreleased/tnir-Layout-SpaceAfterColon.yml

+---
+title: Enable Layout/SpaceAfterColon cop for HAML
+merge_request: 58564
+author: Takuya Noguchi
+type: other

doc/api/dora/metrics.md

@@ -88,3 +88,14 @@ Example response:
   { "2021-03-08": 4, "date": "2021-03-08", "value": 4 }
 ]
 ```
+
+## The `value` field
+
+For both the project and group-level endpoints above, the `value` field in the
+API response has a different meaning depending on the provided `metric` query
+parameter:
+
+| `metric` query parameter | Description of `value` in response                                                                                                                           |
+| ------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| `deployment_frequency`   | The number of successful deployments during the time period.                                                                                                 |
+| `lead_time_for_changes`  | The median number of seconds between the merge of the merge request (MR) and the deployment of the MR's commits for all MRs deployed during the time period. |

doc/api/graphql/reference/index.md

@@ -8021,17 +8021,17 @@ Rotation length unit of an on-call rotation.
 
 | Value | Description |
 | ----- | ----------- |
-| `CANCELED` |  |
-| `CREATED` |  |
-| `FAILED` |  |
-| `MANUAL` |  |
-| `PENDING` |  |
-| `PREPARING` |  |
-| `RUNNING` |  |
-| `SCHEDULED` |  |
-| `SKIPPED` |  |
-| `SUCCESS` |  |
-| `WAITING_FOR_RESOURCE` |  |
+| `CANCELED` | Pipeline was canceled before completion. |
+| `CREATED` | Pipeline has been created. |
+| `FAILED` | At least one stage of the pipeline failed. |
+| `MANUAL` | Pipeline needs to be manually started. |
+| `PENDING` | Pipeline has not started running yet. |
+| `PREPARING` | Pipeline is preparing to run. |
+| `RUNNING` | Pipeline is running. |
+| `SCHEDULED` | Pipeline is scheduled to run. |
+| `SKIPPED` | Pipeline was skipped. |
+| `SUCCESS` | Pipeline completed successfully. |
+| `WAITING_FOR_RESOURCE` | A resource (for example, a runner) that the pipeline requires to run is unavailable. |
 
 ### `ProjectMemberRelation`
 

yarn.lock

@@ -10457,7 +10457,7 @@ schema-utils@^1.0.0:
     ajv-errors "^1.0.0"
     ajv-keywords "^3.1.0"
 
-schema-utils@^2.0.0, schema-utils@^2.5.0, schema-utils@^2.6.5, schema-utils@^2.7.0:
+schema-utils@^2.0.0, schema-utils@^2.6.5, schema-utils@^2.7.0:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"
   integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==