summaryrefslogtreecommitdiff
path: root/app/graphql/types/metrics
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-08-19 09:08:42 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-08-19 09:08:42 +0000
commitb76ae638462ab0f673e5915986070518dd3f9ad3 (patch)
treebdab0533383b52873be0ec0eb4d3c66598ff8b91 /app/graphql/types/metrics
parent434373eabe7b4be9593d18a585fb763f1e5f1a6f (diff)
downloadgitlab-ce-b76ae638462ab0f673e5915986070518dd3f9ad3.tar.gz
Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42
Diffstat (limited to 'app/graphql/types/metrics')
-rw-r--r--app/graphql/types/metrics/dashboard_type.rb4
-rw-r--r--app/graphql/types/metrics/dashboards/annotation_type.rb6
2 files changed, 5 insertions, 5 deletions
diff --git a/app/graphql/types/metrics/dashboard_type.rb b/app/graphql/types/metrics/dashboard_type.rb
index 40d2c2f195c..04cac55894e 100644
--- a/app/graphql/types/metrics/dashboard_type.rb
+++ b/app/graphql/types/metrics/dashboard_type.rb
@@ -7,10 +7,10 @@ module Types
class DashboardType < ::Types::BaseObject
graphql_name 'MetricsDashboard'
- field :path, GraphQL::STRING_TYPE, null: true,
+ field :path, GraphQL::Types::String, null: true,
description: 'Path to a file with the dashboard definition.'
- field :schema_validation_warnings, [GraphQL::STRING_TYPE], null: true,
+ field :schema_validation_warnings, [GraphQL::Types::String], null: true,
description: 'Dashboard schema validation warnings.'
field :annotations, Types::Metrics::Dashboards::AnnotationType.connection_type, null: true,
diff --git a/app/graphql/types/metrics/dashboards/annotation_type.rb b/app/graphql/types/metrics/dashboards/annotation_type.rb
index b9e040dd063..fb35f2bd9a1 100644
--- a/app/graphql/types/metrics/dashboards/annotation_type.rb
+++ b/app/graphql/types/metrics/dashboards/annotation_type.rb
@@ -7,13 +7,13 @@ module Types
authorize :read_metrics_dashboard_annotation
graphql_name 'MetricsDashboardAnnotation'
- field :description, GraphQL::STRING_TYPE, null: true,
+ field :description, GraphQL::Types::String, null: true,
description: 'Description of the annotation.'
- field :id, GraphQL::ID_TYPE, null: false,
+ field :id, GraphQL::Types::ID, null: false,
description: 'ID of the annotation.'
- field :panel_id, GraphQL::STRING_TYPE, null: true,
+ field :panel_id, GraphQL::Types::String, null: true,
description: 'ID of a dashboard panel to which the annotation should be scoped.'
field :starting_at, Types::TimeType, null: true,