Add latest changes from gitlab-org/gitlab@master

4 files changed, 13 insertions, 11 deletions

diff --git a/app/graphql/mutations/concerns/mutations/resolves_resource_parent.rb b/app/graphql/mutations/concerns/mutations/resolves_resource_parent.rb
index e2b3f4b046f..b8ef675c3d4 100644
--- a/app/graphql/mutations/concerns/mutations/resolves_resource_parent.rb
+++ b/app/graphql/mutations/concerns/mutations/resolves_resource_parent.rb
@@ -9,11 +9,11 @@ module Mutations
     included do
       argument :project_path, GraphQL::ID_TYPE,
                required: false,
-               description: 'The project full path the resource is associated with.'
+               description: 'Full path of the project with which the resource is associated.'
 
       argument :group_path, GraphQL::ID_TYPE,
                required: false,
-               description: 'The group full path the resource is associated with.'
+               description: 'Full path of the group with which the resource is associated.'
     end
 
     def ready?(**args)
diff --git a/doc/api/graphql/reference/gitlab_schema.graphql b/doc/api/graphql/reference/gitlab_schema.graphql
index f6f28f203d2..a03177c6a5d 100644
--- a/doc/api/graphql/reference/gitlab_schema.graphql
+++ b/doc/api/graphql/reference/gitlab_schema.graphql
@@ -4500,7 +4500,7 @@ input CreateBoardInput {
   clientMutationId: String
 
   """
-  The group full path the resource is associated with.
+  Full path of the group with which the resource is associated.
   """
   groupPath: ID
 
@@ -4540,7 +4540,7 @@ input CreateBoardInput {
   name: String
 
   """
-  The project full path the resource is associated with.
+  Full path of the project with which the resource is associated.
   """
   projectPath: ID
 
@@ -13903,12 +13903,12 @@ input LabelCreateInput {
   description: String
 
   """
-  The group full path the resource is associated with.
+  Full path of the group with which the resource is associated.
   """
   groupPath: ID
 
   """
-  The project full path the resource is associated with.
+  Full path of the project with which the resource is associated.
   """
   projectPath: ID
 
diff --git a/doc/api/graphql/reference/gitlab_schema.json b/doc/api/graphql/reference/gitlab_schema.json
index 31ed4eec05c..fb1ae27ad96 100644
--- a/doc/api/graphql/reference/gitlab_schema.json
+++ b/doc/api/graphql/reference/gitlab_schema.json
@@ -12224,7 +12224,7 @@
           "inputFields": [
             {
               "name": "projectPath",
-              "description": "The project full path the resource is associated with.",
+              "description": "Full path of the project with which the resource is associated.",
               "type": {
                 "kind": "SCALAR",
                 "name": "ID",
@@ -12234,7 +12234,7 @@
             },
             {
               "name": "groupPath",
-              "description": "The group full path the resource is associated with.",
+              "description": "Full path of the group with which the resource is associated.",
               "type": {
                 "kind": "SCALAR",
                 "name": "ID",
@@ -38140,7 +38140,7 @@
           "inputFields": [
             {
               "name": "projectPath",
-              "description": "The project full path the resource is associated with.",
+              "description": "Full path of the project with which the resource is associated.",
               "type": {
                 "kind": "SCALAR",
                 "name": "ID",
@@ -38150,7 +38150,7 @@
             },
             {
               "name": "groupPath",
-              "description": "The group full path the resource is associated with.",
+              "description": "Full path of the group with which the resource is associated.",
               "type": {
                 "kind": "SCALAR",
                 "name": "ID",
diff --git a/doc/ci/pipelines/job_artifacts.md b/doc/ci/pipelines/job_artifacts.md
index 4c77a578aa4..12310d0c8a8 100644
--- a/doc/ci/pipelines/job_artifacts.md
+++ b/doc/ci/pipelines/job_artifacts.md
@@ -168,9 +168,11 @@ The collected SAST report uploads to GitLab as an artifact and is summarized
 in merge requests and the pipeline view. It's also used to provide data for security
 dashboards.
 
-#### `artifacts:reports:secret_detection` **(ULTIMATE)**
+#### `artifacts:reports:secret_detection`
 
 > - Introduced in GitLab 13.1.
+> - Made [available in all tiers](https://gitlab.com/gitlab-org/gitlab/-/issues/222788) in GitLab
+    13.3.
 > - Requires GitLab Runner 11.5 and above.
 
 The `secret-detection` report collects [detected secrets](../../user/application_security/secret_detection/index.md)