Commit 2dce292a authored by charlie ablett's avatar charlie ablett

Merge branch '268042-user_resolver' into 'master'

Refactor GraphQL/UserResovler to use new GlobalID types

See merge request gitlab-org/gitlab!45372
parents edd74d2a cb00e84c
...@@ -1298,7 +1298,6 @@ Graphql/IDType: ...@@ -1298,7 +1298,6 @@ Graphql/IDType:
- 'app/graphql/resolvers/error_tracking/sentry_error_stack_trace_resolver.rb' - 'app/graphql/resolvers/error_tracking/sentry_error_stack_trace_resolver.rb'
- 'app/graphql/resolvers/snippets_resolver.rb' - 'app/graphql/resolvers/snippets_resolver.rb'
- 'app/graphql/resolvers/user_merge_requests_resolver.rb' - 'app/graphql/resolvers/user_merge_requests_resolver.rb'
- 'app/graphql/resolvers/user_resolver.rb'
# Offense count: 86 # Offense count: 86
# Cop supports --auto-correct. # Cop supports --auto-correct.
......
...@@ -6,7 +6,7 @@ module Resolvers ...@@ -6,7 +6,7 @@ module Resolvers
type Types::UserType, null: true type Types::UserType, null: true
argument :id, GraphQL::ID_TYPE, argument :id, Types::GlobalIDType[User],
required: false, required: false,
description: 'ID of the User' description: 'ID of the User'
......
...@@ -15681,7 +15681,7 @@ type Query { ...@@ -15681,7 +15681,7 @@ type Query {
""" """
ID of the User ID of the User
""" """
id: ID id: UserID
""" """
Username of the User Username of the User
......
...@@ -45328,7 +45328,7 @@ ...@@ -45328,7 +45328,7 @@
"description": "ID of the User", "description": "ID of the User",
"type": { "type": {
"kind": "SCALAR", "kind": "SCALAR",
"name": "ID", "name": "UserID",
"ofType": null "ofType": null
}, },
"defaultValue": null "defaultValue": null
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment