diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 16:18:24 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 16:18:24 +0300 |
commit | 0653e08efd039a5905f3fa4f6e9cef9f5d2f799c (patch) | |
tree | 4dcc884cf6d81db44adae4aa99f8ec1233a41f55 /app/graphql/types/user_interface.rb | |
parent | 744144d28e3e7fddc117924fef88de5d9674fe4c (diff) |
Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42
Diffstat (limited to 'app/graphql/types/user_interface.rb')
-rw-r--r-- | app/graphql/types/user_interface.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/app/graphql/types/user_interface.rb b/app/graphql/types/user_interface.rb index 71c6b7f3019..8c67275eb73 100644 --- a/app/graphql/types/user_interface.rb +++ b/app/graphql/types/user_interface.rb @@ -59,6 +59,10 @@ module Types type: Types::GroupMemberType.connection_type, null: true, description: 'Group memberships of the user.' + field :groups, + resolver: Resolvers::Users::GroupsResolver, + description: 'Groups where the user has access. Will always return `null` if ' \ + '`paginatable_namespace_drop_down_for_project_creation` feature flag is disabled.' field :group_count, resolver: Resolvers::Users::GroupCountResolver, description: 'Group count for the user.' @@ -69,7 +73,7 @@ module Types field :location, type: ::GraphQL::Types::String, null: true, - description: 'The location of the user.' + description: 'Location of the user.' field :project_memberships, type: Types::ProjectMemberType.connection_type, null: true, @@ -82,9 +86,7 @@ module Types null: true, description: 'Personal namespace of the user.' - field :todos, resolver: Resolvers::TodoResolver, description: 'To-do items of the user.' do - extension(::Gitlab::Graphql::TodosProjectPermissionPreloader::FieldExtension) - end + field :todos, resolver: Resolvers::TodoResolver, description: 'To-do items of the user.' # Merge request field: MRs can be authored, assigned, or assigned-for-review: field :authored_merge_requests, |