Add latest changes from gitlab-org/gitlab@master

9 files changed, 54 insertions, 60 deletions

diff --git a/app/assets/javascripts/alert_management/components/alert_details.vue b/app/assets/javascripts/alert_management/components/alert_details.vue
index 8749f102442..be9a5a7ca61 100644
--- a/app/assets/javascripts/alert_management/components/alert_details.vue
+++ b/app/assets/javascripts/alert_management/components/alert_details.vue
@@ -204,7 +204,7 @@ export default {
       :class="{ 'pr-sm-8': sidebarStatus }"
     >
       <div
-        class="gl-display-flex gl-justify-content-space-between gl-align-items-baseline gl-px-1 py-3 py-md-4 gl-border-b-1 gl-border-b-gray-200 gl-border-b-solid flex-column flex-sm-row"
+        class="gl-display-flex gl-justify-content-space-between gl-align-items-baseline gl-px-1 py-3 py-md-4 gl-border-b-1 gl-border-b-gray-100 gl-border-b-solid flex-column flex-sm-row"
       >
         <div
           data-testid="alert-header"
diff --git a/app/assets/javascripts/alert_management/graphql/fragments/detail_item.fragment.graphql b/app/assets/javascripts/alert_management/graphql/fragments/detail_item.fragment.graphql
index d9e4d7505e7..18fab429164 100644
--- a/app/assets/javascripts/alert_management/graphql/fragments/detail_item.fragment.graphql
+++ b/app/assets/javascripts/alert_management/graphql/fragments/detail_item.fragment.graphql
@@ -16,5 +16,4 @@ fragment AlertDetailItem on AlertManagementAlert {
       ...AlertNote
     }
   }
-
 }
diff --git a/app/assets/javascripts/alert_management/graphql/mutations/create_issue_from_alert.mutation.graphql b/app/assets/javascripts/alert_management/graphql/mutations/create_issue_from_alert.mutation.graphql
index 18c9652b262..bc4d91a51d1 100644
--- a/app/assets/javascripts/alert_management/graphql/mutations/create_issue_from_alert.mutation.graphql
+++ b/app/assets/javascripts/alert_management/graphql/mutations/create_issue_from_alert.mutation.graphql
@@ -1,8 +1,8 @@
 mutation createAlertIssue($projectPath: ID!, $iid: String!) {
-    createAlertIssue(input: { iid: $iid,  projectPath: $projectPath }) {
-        errors
-        issue {
-            iid
-        }
+  createAlertIssue(input: { iid: $iid, projectPath: $projectPath }) {
+    errors
+    issue {
+      iid
     }
+  }
 }
diff --git a/app/assets/javascripts/alert_management/graphql/mutations/toggle_sidebar_status.mutation.graphql b/app/assets/javascripts/alert_management/graphql/mutations/toggle_sidebar_status.mutation.graphql
index d9c4813f8e8..f666fcd6782 100644
--- a/app/assets/javascripts/alert_management/graphql/mutations/toggle_sidebar_status.mutation.graphql
+++ b/app/assets/javascripts/alert_management/graphql/mutations/toggle_sidebar_status.mutation.graphql
@@ -1,3 +1,3 @@
 mutation toggleSidebarStatus {
-    toggleSidebarStatus @client
+  toggleSidebarStatus @client
 }
diff --git a/app/assets/javascripts/alert_management/graphql/mutations/update_alert_status.mutation.graphql b/app/assets/javascripts/alert_management/graphql/mutations/update_alert_status.mutation.graphql
index f3ee80e9e82..ba1e607bc10 100644
--- a/app/assets/javascripts/alert_management/graphql/mutations/update_alert_status.mutation.graphql
+++ b/app/assets/javascripts/alert_management/graphql/mutations/update_alert_status.mutation.graphql
@@ -4,9 +4,9 @@ mutation updateAlertStatus($projectPath: ID!, $status: AlertManagementStatus!, $
   updateAlertStatus(input: { iid: $iid, status: $status, projectPath: $projectPath }) {
     errors
     alert {
-      iid,
-      status,
-      endedAt,
+      iid
+      status
+      endedAt
       notes {
         nodes {
           ...AlertNote
diff --git a/app/assets/javascripts/alert_management/graphql/queries/details.query.graphql b/app/assets/javascripts/alert_management/graphql/queries/details.query.graphql
index c02b8accdd1..8881f49b689 100644
--- a/app/assets/javascripts/alert_management/graphql/queries/details.query.graphql
+++ b/app/assets/javascripts/alert_management/graphql/queries/details.query.graphql
@@ -1,11 +1,11 @@
 #import "../fragments/detail_item.fragment.graphql"
 
 query alertDetails($fullPath: ID!, $alertId: String) {
-    project(fullPath: $fullPath) {
-        alertManagementAlerts(iid: $alertId) {
-          nodes {
-            ...AlertDetailItem
-          }
-        }
+  project(fullPath: $fullPath) {
+    alertManagementAlerts(iid: $alertId) {
+      nodes {
+        ...AlertDetailItem
+      }
     }
+  }
 }
diff --git a/app/assets/javascripts/alert_management/graphql/queries/get_alerts.query.graphql b/app/assets/javascripts/alert_management/graphql/queries/get_alerts.query.graphql
index 7545a5e8c4d..8ac00bbc6b5 100644
--- a/app/assets/javascripts/alert_management/graphql/queries/get_alerts.query.graphql
+++ b/app/assets/javascripts/alert_management/graphql/queries/get_alerts.query.graphql
@@ -1,34 +1,34 @@
 #import "../fragments/list_item.fragment.graphql"
 
 query getAlerts(
-    $searchTerm: String,
-    $projectPath: ID!,
-    $statuses: [AlertManagementStatus!],
-    $sort: AlertManagementAlertSort,
-    $firstPageSize: Int,
-    $lastPageSize: Int,
-    $prevPageCursor: String = ""
-    $nextPageCursor: String = ""
+  $searchTerm: String
+  $projectPath: ID!
+  $statuses: [AlertManagementStatus!]
+  $sort: AlertManagementAlertSort
+  $firstPageSize: Int
+  $lastPageSize: Int
+  $prevPageCursor: String = ""
+  $nextPageCursor: String = ""
 ) {
-    project(fullPath: $projectPath, ) {
-        alertManagementAlerts(
-            search: $searchTerm,
-            statuses: $statuses,
-            sort: $sort,
-            first: $firstPageSize
-            last: $lastPageSize,
-            after: $nextPageCursor,
-            before: $prevPageCursor
-        )  {
-            nodes {
-                ...AlertListItem
-            },
-            pageInfo {
-                hasNextPage
-                endCursor
-                hasPreviousPage
-                startCursor
-            }
-        }
+  project(fullPath: $projectPath) {
+    alertManagementAlerts(
+      search: $searchTerm
+      statuses: $statuses
+      sort: $sort
+      first: $firstPageSize
+      last: $lastPageSize
+      after: $nextPageCursor
+      before: $prevPageCursor
+    ) {
+      nodes {
+        ...AlertListItem
+      }
+      pageInfo {
+        hasNextPage
+        endCursor
+        hasPreviousPage
+        startCursor
+      }
     }
+  }
 }
diff --git a/app/assets/javascripts/alert_management/graphql/queries/get_count_by_status.query.graphql b/app/assets/javascripts/alert_management/graphql/queries/get_count_by_status.query.graphql
index 326e8cec272..5a6faea5cd8 100644
--- a/app/assets/javascripts/alert_management/graphql/queries/get_count_by_status.query.graphql
+++ b/app/assets/javascripts/alert_management/graphql/queries/get_count_by_status.query.graphql
@@ -1,16 +1,11 @@
-query getAlertsCount(
-    $searchTerm: String,
-    $projectPath: ID!
-) {
-    project(fullPath: $projectPath) {
-        alertManagementAlertStatusCounts(
-            search: $searchTerm
-        ) {
-            all
-            open
-            acknowledged
-            resolved
-            triggered
-        }
+query getAlertsCount($searchTerm: String, $projectPath: ID!) {
+  project(fullPath: $projectPath) {
+    alertManagementAlertStatusCounts(search: $searchTerm) {
+      all
+      open
+      acknowledged
+      resolved
+      triggered
     }
+  }
 }
diff --git a/app/assets/javascripts/alert_management/graphql/queries/sidebar_status.query.graphql b/app/assets/javascripts/alert_management/graphql/queries/sidebar_status.query.graphql
index 0836f702189..61c570c5cd0 100644
--- a/app/assets/javascripts/alert_management/graphql/queries/sidebar_status.query.graphql
+++ b/app/assets/javascripts/alert_management/graphql/queries/sidebar_status.query.graphql
@@ -1,3 +1,3 @@
 query sidebarStatus {
-    sidebarStatus @client
+  sidebarStatus @client
 }