Commit f3bd1e41 authored by Bob Van Landuyt's avatar Bob Van Landuyt

Merge branch 'ajk-graphql-user-location' into 'master'

Add User.location to GraphQL API

See merge request gitlab-org/gitlab!48059
parents 85332ae2 eefe5d6b
...@@ -38,6 +38,8 @@ module Types ...@@ -38,6 +38,8 @@ module Types
feature_flag: :user_group_counts feature_flag: :user_group_counts
field :status, Types::UserStatusType, null: true, field :status, Types::UserStatusType, null: true,
description: 'User status' description: 'User status'
field :location, ::GraphQL::STRING_TYPE, null: true,
description: 'The location of the user.'
field :project_memberships, Types::ProjectMemberType.connection_type, null: true, field :project_memberships, Types::ProjectMemberType.connection_type, null: true,
description: 'Project memberships of the user', description: 'Project memberships of the user',
method: :project_members method: :project_members
......
---
title: Add User.location field to GraphQL API
merge_request: 48059
author:
type: changed
...@@ -23030,6 +23030,11 @@ type User { ...@@ -23030,6 +23030,11 @@ type User {
""" """
id: ID! id: ID!
"""
The location of the user.
"""
location: String
""" """
Human-readable name of the user Human-readable name of the user
""" """
......
...@@ -66794,6 +66794,20 @@ ...@@ -66794,6 +66794,20 @@
"isDeprecated": false, "isDeprecated": false,
"deprecationReason": null "deprecationReason": null
}, },
{
"name": "location",
"description": "The location of the user.",
"args": [
],
"type": {
"kind": "SCALAR",
"name": "String",
"ofType": null
},
"isDeprecated": false,
"deprecationReason": null
},
{ {
"name": "name", "name": "name",
"description": "Human-readable name of the user", "description": "Human-readable name of the user",
...@@ -3450,6 +3450,7 @@ Autogenerated return type of UpdateSnippet. ...@@ -3450,6 +3450,7 @@ Autogenerated return type of UpdateSnippet.
| `groupCount` | Int | Group count for the user. Available only when feature flag `user_group_counts` is enabled | | `groupCount` | Int | Group count for the user. Available only when feature flag `user_group_counts` is enabled |
| `groupMemberships` | GroupMemberConnection | Group memberships of the user | | `groupMemberships` | GroupMemberConnection | Group memberships of the user |
| `id` | ID! | ID of the user | | `id` | ID! | ID of the user |
| `location` | String | The location of the user. |
| `name` | String! | Human-readable name of the user | | `name` | String! | Human-readable name of the user |
| `projectMemberships` | ProjectMemberConnection | Project memberships of the user | | `projectMemberships` | ProjectMemberConnection | Project memberships of the user |
| `snippets` | SnippetConnection | Snippets authored by the user | | `snippets` | SnippetConnection | Snippets authored by the user |
......
...@@ -21,6 +21,7 @@ RSpec.describe GitlabSchema.types['User'] do ...@@ -21,6 +21,7 @@ RSpec.describe GitlabSchema.types['User'] do
todos todos
state state
status status
location
authoredMergeRequests authoredMergeRequests
assignedMergeRequests assignedMergeRequests
groupMemberships groupMemberships
......
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