Add latest changes from gitlab-org/gitlab@master

app/assets/javascripts/mr_popover/queries/merge_request.query.graphql

-query mergeRequest($projectPath: ID!, $mergeRequestIID: ID!) {
+query mergeRequest($projectPath: ID!, $mergeRequestIID: String!) {
   project(fullPath: $projectPath) {
     mergeRequest(iid: $mergeRequestIID) {
       createdAt

app/assets/javascripts/sidebar/queries/sidebarDetails.query.graphql

-query ($fullPath: ID!, $iid: ID!) {
+query ($fullPath: ID!, $iid: String!) {
   project (fullPath: $fullPath) {
     issue (iid: $iid) {
       iid

app/assets/javascripts/sidebar/queries/sidebarDetailsForHealthStatusFeatureFlag.query.graphql

-query ($fullPath: ID!, $iid: ID!) {
+query ($fullPath: ID!, $iid: String!) {
   project (fullPath: $fullPath) {
     issue (iid: $iid) {
       iid

app/graphql/mutations/issues/base.rb

@@ -9,7 +9,7 @@ module Mutations
                required: true,
                description: "The project the issue to mutate is in"
-      argument :iid, GraphQL::ID_TYPE,
+      argument :iid, GraphQL::STRING_TYPE,
                required: true,
                description: "The iid of the issue to mutate"

app/graphql/mutations/merge_requests/base.rb

@@ -9,7 +9,7 @@ module Mutations
                required: true,
                description: "The project the merge request to mutate is in"
-      argument :iid, GraphQL::ID_TYPE,
+      argument :iid, GraphQL::STRING_TYPE,
                required: true,
                description: "The iid of the merge request to mutate"

app/graphql/resolvers/issues_resolver.rb

@@ -2,11 +2,11 @@
 module Resolvers
   class IssuesResolver < BaseResolver
-    argument :iid, GraphQL::ID_TYPE,
+    argument :iid, GraphQL::STRING_TYPE,
               required: false,
               description: 'IID of the issue. For example, "1"'
-    argument :iids, [GraphQL::ID_TYPE],
+    argument :iids, [GraphQL::STRING_TYPE],
               required: false,
               description: 'List of IIDs of issues. For example, [1, 2]'
     argument :state, Types::IssuableStateEnum,

app/graphql/resolvers/merge_requests_resolver.rb

@@ -2,11 +2,11 @@
 module Resolvers
   class MergeRequestsResolver < BaseResolver
-    argument :iid, GraphQL::ID_TYPE,
+    argument :iid, GraphQL::STRING_TYPE,
               required: false,
               description: 'The IID of the merge request, e.g., "1"'
-    argument :iids, [GraphQL::ID_TYPE],
+    argument :iids, [GraphQL::STRING_TYPE],
               required: false,
               description: 'The list of IIDs of issues, e.g., [1, 2]'

app/graphql/types/ci/pipeline_type.rb

@@ -11,7 +11,7 @@ module Types
       field :id, GraphQL::ID_TYPE, null: false,
             description: 'ID of the pipeline'
-      field :iid, GraphQL::ID_TYPE, null: false,
+      field :iid, GraphQL::STRING_TYPE, null: false,
             description: 'Internal ID of the pipeline'
       field :sha, GraphQL::STRING_TYPE, null: false,

app/graphql/types/merge_request_type.rb

@@ -14,7 +14,7 @@ module Types
     field :id, GraphQL::ID_TYPE, null: false,
           description: 'ID of the merge request'
-    field :iid, GraphQL::ID_TYPE, null: false,
+    field :iid, GraphQL::STRING_TYPE, null: false,
           description: 'Internal ID of the merge request'
     field :title, GraphQL::STRING_TYPE, null: false,
           description: 'Title of the merge request'

changelogs/unreleased/sh-enable-redis-key-compression.yml

+---
+title: Enable Redis cache key compression
+merge_request: 27254
+author:
+type: performance

changelogs/unreleased/switch-ff-ci-dynamic-child-pipeline.yml

+---
+title: Enable feature Dynamic Child Pipeline creation via artifact
+merge_request: 26648
+author:
+type: added

config/application.rb

@@ -258,7 +258,7 @@ module Gitlab
     # Full list of options:
     # https://api.rubyonrails.org/classes/ActiveSupport/Cache/RedisCacheStore.html#method-c-new
     caching_config_hash = Gitlab::Redis::Cache.params
-    caching_config_hash[:compress] = false
+    caching_config_hash[:compress] = Gitlab::Utils.to_boolean(ENV.fetch('ENABLE_REDIS_CACHE_COMPRESSION', '1'))
     caching_config_hash[:namespace] = Gitlab::Redis::Cache::CACHE_NAMESPACE
     caching_config_hash[:expires_in] = 2.weeks # Cache should not grow forever
     if Gitlab::Runtime.multi_threaded?

config/initializers/console_message.rb

@@ -5,7 +5,7 @@ if Gitlab::Runtime.console?
   puts '-' * 80
   puts " GitLab:".ljust(justify) + "#{Gitlab::VERSION} (#{Gitlab.revision}) #{Gitlab.ee? ? 'EE' : 'FOSS'}"
-  puts " GitLab Shell:".ljust(justify) + "#{Gitlab::VersionInfo.parse(Gitlab::Shell.new.version)}"
+  puts " GitLab Shell:".ljust(justify) + "#{Gitlab::VersionInfo.parse(Gitlab::Shell.version)}"
   if Gitlab::Database.exists?
     puts " #{Gitlab::Database.human_adapter_name}:".ljust(justify) + Gitlab::Database.version

danger/metadata/Dangerfile

@@ -5,7 +5,8 @@ THROUGHPUT_LABELS = [
   'security',
   'bug',
   'feature',
-  'backstage'
+  'backstage',
+  'documentation'
 ].freeze
 if gitlab.mr_body.size < 5

doc/api/graphql/reference/gitlab_schema.graphql

@@ -3757,7 +3757,7 @@ input IssueSetConfidentialInput {
   """
   The iid of the issue to mutate
   """
-  iid: ID!
+  iid: String!
   """
   The project the issue to mutate is in
@@ -3802,7 +3802,7 @@ input IssueSetDueDateInput {
   """
   The iid of the issue to mutate
   """
-  iid: ID!
+  iid: String!
   """
   The project the issue to mutate is in
@@ -3842,7 +3842,7 @@ input IssueSetWeightInput {
   """
   The iid of the issue to mutate
   """
-  iid: ID!
+  iid: String!
   """
   The project the issue to mutate is in
@@ -4150,7 +4150,7 @@ type MergeRequest implements Noteable {
   """
   Internal ID of the merge request
   """
-  iid: ID!
+  iid: String!
   """
   Commit SHA of the merge request if merge is in progress
@@ -4550,7 +4550,7 @@ input MergeRequestSetAssigneesInput {
   """
   The iid of the merge request to mutate
   """
-  iid: ID!
+  iid: String!
   """
   The operation to perform. Defaults to REPLACE.
@@ -4595,7 +4595,7 @@ input MergeRequestSetLabelsInput {
   """
   The iid of the merge request to mutate
   """
-  iid: ID!
+  iid: String!
   """
   The Label IDs to set. Replaces existing labels by default.
@@ -4645,7 +4645,7 @@ input MergeRequestSetLockedInput {
   """
   The iid of the merge request to mutate
   """
-  iid: ID!
+  iid: String!
   """
   Whether or not to lock the merge request.
@@ -4690,7 +4690,7 @@ input MergeRequestSetMilestoneInput {
   """
   The iid of the merge request to mutate
   """
-  iid: ID!
+  iid: String!
   """
   The milestone to assign to the merge request.
@@ -4735,7 +4735,7 @@ input MergeRequestSetSubscriptionInput {
   """
   The iid of the merge request to mutate
   """
-  iid: ID!
+  iid: String!
   """
   The project the merge request to mutate is in
@@ -4780,7 +4780,7 @@ input MergeRequestSetWipInput {
   """
   The iid of the merge request to mutate
   """
-  iid: ID!
+  iid: String!
   """
   The project the merge request to mutate is in
@@ -5351,7 +5351,7 @@ type Pipeline {
   """
   Internal ID of the pipeline
   """
-  iid: ID!
+  iid: String!
   """
   SHA of the pipeline's commit
@@ -5629,12 +5629,12 @@ type Project {
     """
     IID of the issue. For example, "1"
     """
-    iid: ID
+    iid: String
     """
     List of IIDs of issues. For example, [1, 2]
     """
-    iids: [ID!]
+    iids: [String!]
     """
     Labels applied to this issue
@@ -5724,12 +5724,12 @@ type Project {
     """
     IID of the issue. For example, "1"
     """
-    iid: ID
+    iid: String
     """
     List of IIDs of issues. For example, [1, 2]
     """
-    iids: [ID!]
+    iids: [String!]
     """
     Labels applied to this issue
@@ -5799,12 +5799,12 @@ type Project {
     """
     The IID of the merge request, e.g., "1"
     """
-    iid: ID
+    iid: String
     """
     The list of IIDs of issues, e.g., [1, 2]
     """
-    iids: [ID!]
+    iids: [String!]
   ): MergeRequest
   """
@@ -5829,12 +5829,12 @@ type Project {
     """
     The IID of the merge request, e.g., "1"
     """
-    iid: ID
+    iid: String
     """
     The list of IIDs of issues, e.g., [1, 2]
     """
-    iids: [ID!]
+    iids: [String!]
     """
     Returns the last _n_ elements from the list.
@@ -8112,7 +8112,7 @@ input UpdateIssueInput {
   """
   The iid of the issue to mutate
   """
-  iid: ID!
+  iid: String!
   """
   The project the issue to mutate is in

doc/api/graphql/reference/gitlab_schema.json

@@ -10768,7 +10768,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "ID",
+                  "name": "String",
                   "ofType": null
                 }
               },
@@ -10898,7 +10898,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "ID",
+                  "name": "String",
                   "ofType": null
                 }
               },
@@ -11028,7 +11028,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "ID",
+                  "name": "String",
                   "ofType": null
                 }
               },
@@ -11861,7 +11861,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "ID",
+                  "name": "String",
                   "ofType": null
                 }
               },
@@ -13024,7 +13024,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "ID",
+                  "name": "String",
                   "ofType": null
                 }
               },
@@ -13172,7 +13172,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "ID",
+                  "name": "String",
                   "ofType": null
                 }
               },
@@ -13320,7 +13320,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "ID",
+                  "name": "String",
                   "ofType": null
                 }
               },
@@ -13450,7 +13450,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "ID",
+                  "name": "String",
                   "ofType": null
                 }
               },
@@ -13576,7 +13576,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "ID",
+                  "name": "String",
                   "ofType": null
                 }
               },
@@ -13706,7 +13706,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "ID",
+                  "name": "String",
                   "ofType": null
                 }
               },
@@ -16283,7 +16283,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "ID",
+                  "name": "String",
                   "ofType": null
                 }
               },
@@ -17021,7 +17021,7 @@
                   "description": "IID of the issue. For example, \"1\"",
                   "type": {
                     "kind": "SCALAR",
-                    "name": "ID",
+                    "name": "String",
                     "ofType": null
                   },
                   "defaultValue": null
@@ -17037,7 +17037,7 @@
                       "name": null,
                       "ofType": {
                         "kind": "SCALAR",
-                        "name": "ID",
+                        "name": "String",
                         "ofType": null
                       }
                     }
@@ -17200,7 +17200,7 @@
                   "description": "IID of the issue. For example, \"1\"",
                   "type": {
                     "kind": "SCALAR",
-                    "name": "ID",
+                    "name": "String",
                     "ofType": null
                   },
                   "defaultValue": null
@@ -17216,7 +17216,7 @@
                       "name": null,
                       "ofType": {
                         "kind": "SCALAR",
-                        "name": "ID",
+                        "name": "String",
                         "ofType": null
                       }
                     }
@@ -17475,7 +17475,7 @@
                   "description": "The IID of the merge request, e.g., \"1\"",
                   "type": {
                     "kind": "SCALAR",
-                    "name": "ID",
+                    "name": "String",
                     "ofType": null
                   },
                   "defaultValue": null
@@ -17491,7 +17491,7 @@
                       "name": null,
                       "ofType": {
                         "kind": "SCALAR",
-                        "name": "ID",
+                        "name": "String",
                         "ofType": null
                       }
                     }
@@ -17516,7 +17516,7 @@
                   "description": "The IID of the merge request, e.g., \"1\"",
                   "type": {
                     "kind": "SCALAR",
-                    "name": "ID",
+                    "name": "String",
                     "ofType": null
                   },
                   "defaultValue": null
@@ -17532,7 +17532,7 @@
                       "name": null,
                       "ofType": {
                         "kind": "SCALAR",
-                        "name": "ID",
+                        "name": "String",
                         "ofType": null
                       }
                     }
@@ -24526,7 +24526,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "ID",
+                  "name": "String",
                   "ofType": null
                 }
               },

doc/api/graphql/reference/index.md

@@ -630,7 +630,7 @@ Autogenerated return type of MarkAsSpamSnippet
 | `forceRemoveSourceBranch` | Boolean | Indicates if the project settings will lead to source branch deletion after merge |
 | `headPipeline` | Pipeline | The pipeline running on the branch HEAD of the merge request |
 | `id` | ID! | ID of the merge request |
-| `iid` | ID! | Internal ID of the merge request |
+| `iid` | String! | Internal ID of the merge request |
 | `inProgressMergeCommitSha` | String | Commit SHA of the merge request if merge is in progress |
 | `mergeCommitMessage` **{warning-solid}** | String | **Deprecated:** Renamed to defaultMergeCommitMessage |
 | `mergeCommitSha` | String | SHA of the merge request commit (set once merged) |
@@ -834,7 +834,7 @@ Information about pagination in a connection.
 | `duration` | Int | Duration of the pipeline in seconds |
 | `finishedAt` | Time | Timestamp of the pipeline's completion |
 | `id` | ID! | ID of the pipeline |
-| `iid` | ID! | Internal ID of the pipeline |
+| `iid` | String! | Internal ID of the pipeline |
 | `sha` | String! | SHA of the pipeline's commit |
 | `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) |

doc/api/releases/index.md

@@ -308,7 +308,12 @@ Example response:
          }
       ],
       "links":[
-
+         {
+            "id":3,
+            "name":"hoge",
+            "url":"https://gitlab.example.com/root/awesome-app/-/tags/v0.11.1/binaries/linux-amd64",
+            "external":true
+         }
       ],
       "evidence_url":"https://gitlab.example.com/root/awesome-app/-/releases/v0.1/evidence.json"
    },
@@ -334,13 +339,14 @@ POST /projects/:id/releases
 | `assets:links`     | array of hash   | no                          | An array of assets links.                                                                                                        |
 | `assets:links:name`| string          | required by: `assets:links` | The name of the link.                                                                                                            |
 | `assets:links:url` | string          | required by: `assets:links` | The url of the link.                                                                                                             |
+| `assets:links:filepath` | string     | no | Optional path for a [Direct Asset link](../../user/project/releases.md).
 | `released_at`      | datetime        | no                          | The date when the release will be/was ready. Defaults to the current time. Expected in ISO 8601 format (`2019-03-15T08:00:00Z`). |
 Example request:
 ```shell
 curl --header 'Content-Type: application/json' --header "PRIVATE-TOKEN: gDybLx3yrUK_HLp3qPjS" \
-     --data '{ "name": "New release", "tag_name": "v0.3", "description": "Super nice release", "milestones": ["v1.0", "v1.0-rc"], "assets": { "links": [{ "name": "hoge", "url": "https://google.com" }] } }' \
+     --data '{ "name": "New release", "tag_name": "v0.3", "description": "Super nice release", "milestones": ["v1.0", "v1.0-rc"], "assets": { "links": [{ "name": "hoge", "url": "https://google.com", "filepath": "/binaries/linux-amd64" }] } }' \
      --request POST https://gitlab.example.com/api/v4/projects/24/releases
 ```
@@ -441,7 +447,7 @@ Example response:
          {
             "id":3,
             "name":"hoge",
-            "url":"https://google.com",
+            "url":"https://gitlab.example.com/root/awesome-app/-/tags/v0.11.1/binaries/linux-amd64",
             "external":true
          }
       ],

doc/ci/parent_child_pipelines.md

@@ -126,7 +126,22 @@ microservice_a:
       script: ...
     ```
+## Dynamic child pipelines
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/35632) in GitLab 12.9.
+
+Instead of running a child pipeline from a static YAML file, you can define a job that runs
+your own script to generate a YAML file, which is then [used to trigger a child pipeline](yaml/README.md#trigger-child-pipeline-with-generated-configuration-file).
+
+This technique can be very powerful in generating pipelines targeting content that changed or to
+build a matrix of targets and architectures.
+
 ## Limitations
 A parent pipeline can trigger many child pipelines, but a child pipeline cannot trigger
-further child pipelines. See the [related issue](https://gitlab.com/gitlab-org/gitlab/issues/29651) for discussion on possible future improvements.
+further child pipelines. See the [related issue](https://gitlab.com/gitlab-org/gitlab/issues/29651)
+for discussion on possible future improvements.
+
+When triggering dynamic child pipelines, if the job containing the CI config artifact is not a predecessor of the
+trigger job, the child pipeline will fail to be created, causing also the parent pipeline to fail.
+In the future we want to validate the trigger job's dependencies [at the time the parent pipeline is created](https://gitlab.com/gitlab-org/gitlab/-/issues/209070) rather than when the child pipeline is created.

doc/ci/yaml/README.md

@@ -2899,6 +2899,31 @@ trigger_job:
     strategy: depend
 ```
+##### Trigger child pipeline with generated configuration file
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/35632) in GitLab 12.9.
+
+You can also trigger a child pipeline from a [dynamically generated configuration file](../parent_child_pipelines.md#dynamic-child-pipelines):
+
+```yaml
+generate-config:
+  stage: build
+  script: generate-ci-config > generated-config.yml
+  artifacts:
+    paths:
+      - generated-config.yml
+
+child-pipeline:
+  stage: test
+  trigger:
+    include:
+      - artifact: generated-config.yml
+        job: generate-config
+```
+
+The `generated-config.yml` is extracted from the artifacts and used as the configuration
+for triggering the child pipeline.
+
 #### Linking pipelines with `trigger:strategy`
 By default, the `trigger` job completes with the `success` status