diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-20 23:50:22 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-20 23:50:22 +0000 |
commit | 9dc93a4519d9d5d7be48ff274127136236a3adb3 (patch) | |
tree | 70467ae3692a0e35e5ea56bcb803eb512a10bedb /app/graphql/types/query_type.rb | |
parent | 4b0f34b6d759d6299322b3a54453e930c6121ff0 (diff) | |
download | gitlab-ce-9dc93a4519d9d5d7be48ff274127136236a3adb3.tar.gz |
Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43
Diffstat (limited to 'app/graphql/types/query_type.rb')
-rw-r--r-- | app/graphql/types/query_type.rb | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/app/graphql/types/query_type.rb b/app/graphql/types/query_type.rb index 74818bfcd42..8af0db644dd 100644 --- a/app/graphql/types/query_type.rb +++ b/app/graphql/types/query_type.rb @@ -55,7 +55,10 @@ module Types field :container_repository, Types::ContainerRepositoryDetailsType, null: true, description: 'Find a container repository.' do - argument :id, ::Types::GlobalIDType[::ContainerRepository], required: true, description: 'The global ID of the container repository.' + argument :id, + type: ::Types::GlobalIDType[::ContainerRepository], + required: true, + description: 'The global ID of the container repository.' end field :package, @@ -72,9 +75,7 @@ module Types description: 'Find users.', resolver: Resolvers::UsersResolver - field :echo, GraphQL::STRING_TYPE, null: false, - description: 'Text to echo back.', - resolver: Resolvers::EchoResolver + field :echo, resolver: Resolvers::EchoResolver field :issue, Types::IssueType, null: true, @@ -82,11 +83,16 @@ module Types argument :id, ::Types::GlobalIDType[::Issue], required: true, description: 'The global ID of the Issue.' end - field :instance_statistics_measurements, Types::Admin::Analytics::UsageTrends::MeasurementType.connection_type, + field :instance_statistics_measurements, + type: Types::Admin::Analytics::UsageTrends::MeasurementType.connection_type, null: true, description: 'Get statistics on the instance.', - deprecated: { reason: 'This field was renamed. Use the `usageTrendsMeasurements` field instead', milestone: '13.10' }, - resolver: Resolvers::Admin::Analytics::UsageTrends::MeasurementsResolver + resolver: Resolvers::Admin::Analytics::UsageTrends::MeasurementsResolver, + deprecated: { + reason: :renamed, + replacement: 'Query.usageTrendsMeasurements', + milestone: '13.10' + } field :usage_trends_measurements, Types::Admin::Analytics::UsageTrends::MeasurementType.connection_type, null: true, @@ -97,18 +103,10 @@ module Types null: true, description: 'CI related settings that apply to the entire instance.' - field :runner_platforms, Types::Ci::RunnerPlatformType.connection_type, - null: true, description: 'Supported runner platforms.', - resolver: Resolvers::Ci::RunnerPlatformsResolver - - field :runner_setup, Types::Ci::RunnerSetupType, null: true, - description: 'Get runner setup instructions.', - resolver: Resolvers::Ci::RunnerSetupResolver + field :runner_platforms, resolver: Resolvers::Ci::RunnerPlatformsResolver + field :runner_setup, resolver: Resolvers::Ci::RunnerSetupResolver - field :ci_config, Types::Ci::Config::ConfigType, null: true, - description: 'Get linted and processed contents of a CI config. Should not be requested more than once per request.', - resolver: Resolvers::Ci::ConfigResolver, - complexity: 126 # AUTHENTICATED_COMPLEXITY / 2 + 1 + field :ci_config, resolver: Resolvers::Ci::ConfigResolver, complexity: 126 # AUTHENTICATED_COMPLEXITY / 2 + 1 def design_management DesignManagementObject.new(nil) |