Add latest changes from gitlab-org/gitlab@master

11 files changed, 39 insertions, 1 deletions

diff --git a/app/graphql/queries/container_registry/get_container_repositories.query.graphql b/app/graphql/queries/container_registry/get_container_repositories.query.graphql
index df0b590acac..40e2934a038 100644
--- a/app/graphql/queries/container_registry/get_container_repositories.query.graphql
+++ b/app/graphql/queries/container_registry/get_container_repositories.query.graphql
@@ -10,6 +10,7 @@ query getProjectContainerRepositories(
 ) {
   project(fullPath: $fullPath) @skip(if: $isGroupPage) {
     __typename
+    id
     containerRepositoriesCount
     containerRepositories(
       name: $name
@@ -43,6 +44,7 @@ query getProjectContainerRepositories(
   }
   group(fullPath: $fullPath) @include(if: $isGroupPage) {
     __typename
+    id
     containerRepositoriesCount
     containerRepositories(
       name: $name
diff --git a/app/graphql/queries/design_management/design_permissions.query.graphql b/app/graphql/queries/design_management/design_permissions.query.graphql
index 55dfa35129c..a81afd47625 100644
--- a/app/graphql/queries/design_management/design_permissions.query.graphql
+++ b/app/graphql/queries/design_management/design_permissions.query.graphql
@@ -4,6 +4,7 @@ query permissions($fullPath: ID!, $iid: String!) {
     id
     issue(iid: $iid) {
       __typename
+      id
       userPermissions {
         __typename
         createDesign
diff --git a/app/graphql/queries/design_management/get_design_list.query.graphql b/app/graphql/queries/design_management/get_design_list.query.graphql
index 01503a9572f..f0caa7c5b4c 100644
--- a/app/graphql/queries/design_management/get_design_list.query.graphql
+++ b/app/graphql/queries/design_management/get_design_list.query.graphql
@@ -4,6 +4,7 @@ query getDesignList($fullPath: ID!, $iid: String!, $atVersion: ID) {
     id
     issue(iid: $iid) {
       __typename
+      id
       designCollection {
         __typename
         copyState
diff --git a/app/graphql/queries/epic/epic_children.query.graphql b/app/graphql/queries/epic/epic_children.query.graphql
index be82813dddb..9e76af48152 100644
--- a/app/graphql/queries/epic/epic_children.query.graphql
+++ b/app/graphql/queries/epic/epic_children.query.graphql
@@ -47,6 +47,7 @@ fragment EpicNode on Epic {
   hasIssues
   group {
     __typename
+    id
     fullPath
   }
 }
@@ -70,6 +71,9 @@ query childItems(
         __typename
         edges {
           __typename
+          # We have an id in deeply nested fragment
+          # TODO: Uncomment next line when https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75220 is merged and the rule is enabled
+          # # eslint-disable-next-line @graphql-eslint/require-id-when-available
           node {
             __typename
             ...EpicNode
@@ -86,6 +90,7 @@ query childItems(
           __typename
           node {
             __typename
+            id
             iid
             epicIssueId
             title
@@ -106,6 +111,7 @@ query childItems(
                 __typename
                 node {
                   __typename
+                  id
                   webUrl
                   name
                   username
@@ -115,6 +121,7 @@ query childItems(
             }
             milestone {
               __typename
+              id
               title
               startDate
               dueDate
diff --git a/app/graphql/queries/epic/epic_details.query.graphql b/app/graphql/queries/epic/epic_details.query.graphql
index 406d630b180..eb4757a845a 100644
--- a/app/graphql/queries/epic/epic_details.query.graphql
+++ b/app/graphql/queries/epic/epic_details.query.graphql
@@ -1,14 +1,17 @@
 query epicDetails($fullPath: ID!, $iid: ID!) {
   group(fullPath: $fullPath) {
     __typename
+    id
     epic(iid: $iid) {
       __typename
+      id
       participants {
         __typename
         edges {
           __typename
           node {
             __typename
+            id
             name
             avatarUrl
             webUrl
diff --git a/app/graphql/queries/pipelines/get_pipeline_details.query.graphql b/app/graphql/queries/pipelines/get_pipeline_details.query.graphql
index 4e4caa1e27c..dd5c9e07488 100644
--- a/app/graphql/queries/pipelines/get_pipeline_details.query.graphql
+++ b/app/graphql/queries/pipelines/get_pipeline_details.query.graphql
@@ -5,16 +5,19 @@ fragment LinkedPipelineData on Pipeline {
   path
   status: detailedStatus {
     __typename
+    id
     group
     label
     icon
   }
   sourceJob {
     __typename
+    id
     name
   }
   project {
     __typename
+    id
     name
     fullPath
   }
@@ -23,6 +26,7 @@ fragment LinkedPipelineData on Pipeline {
 query getPipelineDetails($projectPath: ID!, $iid: ID!) {
   project(fullPath: $projectPath) {
     __typename
+    id
     pipeline(iid: $iid) {
       __typename
       id
@@ -45,11 +49,14 @@ query getPipelineDetails($projectPath: ID!, $iid: ID!) {
         __typename
         nodes {
           __typename
+          id
           name
           status: detailedStatus {
             __typename
+            id
             action {
               __typename
+              id
               icon
               path
               title
@@ -59,8 +66,10 @@ query getPipelineDetails($projectPath: ID!, $iid: ID!) {
             __typename
             nodes {
               __typename
+              id
               status: detailedStatus {
                 __typename
+                id
                 label
                 group
                 icon
@@ -71,17 +80,20 @@ query getPipelineDetails($projectPath: ID!, $iid: ID!) {
                 __typename
                 nodes {
                   __typename
+                  id
                   name
                   scheduledAt
                   needs {
                     __typename
                     nodes {
                       __typename
+                      id
                       name
                     }
                   }
                   status: detailedStatus {
                     __typename
+                    id
                     icon
                     tooltip
                     hasDetails
@@ -89,6 +101,7 @@ query getPipelineDetails($projectPath: ID!, $iid: ID!) {
                     group
                     action {
                       __typename
+                      id
                       buttonTitle
                       icon
                       path
diff --git a/app/graphql/queries/releases/all_releases.query.graphql b/app/graphql/queries/releases/all_releases.query.graphql
index ab8cbcb8aa3..150f59832f3 100644
--- a/app/graphql/queries/releases/all_releases.query.graphql
+++ b/app/graphql/queries/releases/all_releases.query.graphql
@@ -11,6 +11,7 @@ query allReleases(
 ) {
   project(fullPath: $fullPath) {
     __typename
+    id
     releases(first: $first, last: $last, before: $before, after: $after, sort: $sort) {
       __typename
       nodes {
@@ -50,6 +51,7 @@ query allReleases(
           __typename
           nodes {
             __typename
+            id
             filepath
             collectedAt
             sha
@@ -67,12 +69,14 @@ query allReleases(
         }
         commit {
           __typename
+          id
           sha
           webUrl
           title
         }
         author {
           __typename
+          id
           webUrl
           avatarUrl
           username
diff --git a/app/graphql/queries/repository/path_last_commit.query.graphql b/app/graphql/queries/repository/path_last_commit.query.graphql
index b5c5f653429..bcb07ae3182 100644
--- a/app/graphql/queries/repository/path_last_commit.query.graphql
+++ b/app/graphql/queries/repository/path_last_commit.query.graphql
@@ -1,13 +1,14 @@
 query pathLastCommit($projectPath: ID!, $path: String, $ref: String!) {
   project(fullPath: $projectPath) {
-    id
     __typename
+    id
     repository {
       __typename
       tree(path: $path, ref: $ref) {
         __typename
         lastCommit {
           __typename
+          id
           sha
           title
           titleHtml
@@ -19,6 +20,7 @@ query pathLastCommit($projectPath: ID!, $path: String, $ref: String!) {
           authorGravatar
           author {
             __typename
+            id
             name
             avatarUrl
             webPath
@@ -30,8 +32,10 @@ query pathLastCommit($projectPath: ID!, $path: String, $ref: String!) {
               __typename
               node {
                 __typename
+                id
                 detailedStatus {
                   __typename
+                  id
                   detailsPath
                   icon
                   tooltip
diff --git a/app/graphql/queries/snippet/project_permissions.query.graphql b/app/graphql/queries/snippet/project_permissions.query.graphql
index 0c38e4f8a07..e0de79f4449 100644
--- a/app/graphql/queries/snippet/project_permissions.query.graphql
+++ b/app/graphql/queries/snippet/project_permissions.query.graphql
@@ -1,6 +1,7 @@
 query CanCreateProjectSnippet($fullPath: ID!) {
   project(fullPath: $fullPath) {
     __typename
+    id
     userPermissions {
       __typename
       createSnippet
diff --git a/app/graphql/queries/snippet/snippet.query.graphql b/app/graphql/queries/snippet/snippet.query.graphql
index ebfc135c51c..24b268ec853 100644
--- a/app/graphql/queries/snippet/snippet.query.graphql
+++ b/app/graphql/queries/snippet/snippet.query.graphql
@@ -49,6 +49,7 @@ query GetSnippetQuery($ids: [SnippetID!]) {
       }
       project {
         __typename
+        id
         fullPath
         webUrl
       }
diff --git a/app/graphql/queries/snippet/user_permissions.query.graphql b/app/graphql/queries/snippet/user_permissions.query.graphql
index a4914189807..4d131c48feb 100644
--- a/app/graphql/queries/snippet/user_permissions.query.graphql
+++ b/app/graphql/queries/snippet/user_permissions.query.graphql
@@ -1,6 +1,7 @@
 query CanCreatePersonalSnippet {
   currentUser {
     __typename
+    id
     userPermissions {
       __typename
       createSnippet