Merge branch 'query-user-type-fix' into 'master'

Query Type: Remove Duplicate User type Declaration

See merge request gitlab-org/gitlab!34749

app/graphql/types/query_type.rb

@@ -47,11 +47,6 @@ module Types
           null: false,
           description: 'Fields related to design management'
 
-    field :user, Types::UserType,
-          null: true,
-          description: 'Find a user',
-          resolver: Resolvers::UserResolver
-
     field :users, Types::UserType.connection_type,
           null: true,
           description: 'Find users',
@@ -61,8 +56,9 @@ module Types
           description: 'Text to echo back',
           resolver: Resolvers::EchoResolver
 
-    field :user, Types::UserType, null: true,
-          description: 'Find a user on this instance',
+    field :user, Types::UserType,
+          null: true,
+          description: 'Find a user',
           resolver: Resolvers::UserResolver
 
     def design_management

doc/api/graphql/reference/gitlab_schema.graphql

@@ -9942,7 +9942,7 @@ type Query {
   ): SnippetConnection
 
   """
-  Find a user on this instance
+  Find a user
   """
   user(
     """

doc/api/graphql/reference/gitlab_schema.json

@@ -29206,7 +29206,7 @@
             },
             {
               "name": "user",
-              "description": "Find a user on this instance",
+              "description": "Find a user",
               "args": [
                 {
                   "name": "id",