Add latest changes from gitlab-org/gitlab@master

6 files changed, 14 insertions, 6 deletions

diff --git a/app/assets/javascripts/alerts_settings/graphql/mutations/destroy_http_integration.mutation.graphql b/app/assets/javascripts/alerts_settings/graphql/mutations/destroy_http_integration.mutation.graphql
index a3a50651fd0..05bf8eab524 100644
--- a/app/assets/javascripts/alerts_settings/graphql/mutations/destroy_http_integration.mutation.graphql
+++ b/app/assets/javascripts/alerts_settings/graphql/mutations/destroy_http_integration.mutation.graphql
@@ -1,6 +1,6 @@
 #import "../fragments/http_integration_item.fragment.graphql"
 
-mutation destroyHttpIntegration($id: ID!) {
+mutation destroyHttpIntegration($id: AlertManagementHttpIntegrationID!) {
   httpIntegrationDestroy(input: { id: $id }) {
     errors
     integration {
diff --git a/app/assets/javascripts/alerts_settings/graphql/mutations/reset_http_token.mutation.graphql b/app/assets/javascripts/alerts_settings/graphql/mutations/reset_http_token.mutation.graphql
index c0754d8e32b..65245bfb914 100644
--- a/app/assets/javascripts/alerts_settings/graphql/mutations/reset_http_token.mutation.graphql
+++ b/app/assets/javascripts/alerts_settings/graphql/mutations/reset_http_token.mutation.graphql
@@ -1,6 +1,6 @@
 #import "../fragments/http_integration_item.fragment.graphql"
 
-mutation resetHttpIntegrationToken($id: ID!) {
+mutation resetHttpIntegrationToken($id: AlertManagementHttpIntegrationID!) {
   httpIntegrationResetToken(input: { id: $id }) {
     errors
     integration {
diff --git a/app/assets/javascripts/alerts_settings/graphql/mutations/reset_prometheus_token.mutation.graphql b/app/assets/javascripts/alerts_settings/graphql/mutations/reset_prometheus_token.mutation.graphql
index 8f34521b9fd..99179fca1f9 100644
--- a/app/assets/javascripts/alerts_settings/graphql/mutations/reset_prometheus_token.mutation.graphql
+++ b/app/assets/javascripts/alerts_settings/graphql/mutations/reset_prometheus_token.mutation.graphql
@@ -1,6 +1,6 @@
 #import "../fragments/integration_item.fragment.graphql"
 
-mutation resetPrometheusIntegrationToken($id: ID!) {
+mutation resetPrometheusIntegrationToken($id: IntegrationsPrometheusID!) {
   prometheusIntegrationResetToken(input: { id: $id }) {
     errors
     integration {
diff --git a/app/assets/javascripts/alerts_settings/graphql/mutations/update_http_integration.mutation.graphql b/app/assets/javascripts/alerts_settings/graphql/mutations/update_http_integration.mutation.graphql
index 37df9ec25eb..cc9e841ffb9 100644
--- a/app/assets/javascripts/alerts_settings/graphql/mutations/update_http_integration.mutation.graphql
+++ b/app/assets/javascripts/alerts_settings/graphql/mutations/update_http_integration.mutation.graphql
@@ -1,6 +1,10 @@
 #import "../fragments/http_integration_item.fragment.graphql"
 
-mutation updateHttpIntegration($id: ID!, $name: String!, $active: Boolean!) {
+mutation updateHttpIntegration(
+  $id: AlertManagementHttpIntegrationID!
+  $name: String!
+  $active: Boolean!
+) {
   httpIntegrationUpdate(input: { id: $id, name: $name, active: $active }) {
     errors
     integration {
diff --git a/app/assets/javascripts/alerts_settings/graphql/mutations/update_prometheus_integration.mutation.graphql b/app/assets/javascripts/alerts_settings/graphql/mutations/update_prometheus_integration.mutation.graphql
index 62761730bd2..95d72e4af91 100644
--- a/app/assets/javascripts/alerts_settings/graphql/mutations/update_prometheus_integration.mutation.graphql
+++ b/app/assets/javascripts/alerts_settings/graphql/mutations/update_prometheus_integration.mutation.graphql
@@ -1,6 +1,10 @@
 #import "../fragments/integration_item.fragment.graphql"
 
-mutation updatePrometheusIntegration($id: ID!, $apiUrl: String!, $active: Boolean!) {
+mutation updatePrometheusIntegration(
+  $id: IntegrationsPrometheusID!
+  $apiUrl: String!
+  $active: Boolean!
+) {
   prometheusIntegrationUpdate(input: { id: $id, apiUrl: $apiUrl, active: $active }) {
     errors
     integration {
diff --git a/app/assets/javascripts/alerts_settings/graphql/queries/get_http_integration.query.graphql b/app/assets/javascripts/alerts_settings/graphql/queries/get_http_integration.query.graphql
index 7299e6836d4..5f6ab27cae9 100644
--- a/app/assets/javascripts/alerts_settings/graphql/queries/get_http_integration.query.graphql
+++ b/app/assets/javascripts/alerts_settings/graphql/queries/get_http_integration.query.graphql
@@ -1,6 +1,6 @@
 #import "ee_else_ce/alerts_settings/graphql/fragments/http_integration_payload_data.fragment.graphql"
 
-query getHttpIntegration($projectPath: ID!, $id: ID) {
+query getHttpIntegration($projectPath: ID!, $id: AlertManagementHttpIntegrationID!) {
   project(fullPath: $projectPath) {
     id
     alertManagementHttpIntegrations(id: $id) {