diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-04 19:51:40 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-04 19:51:40 +0300 |
commit | aefe6486cf0d193067112b90145083d73b96bfef (patch) | |
tree | 02dbf7d022069b183f34b63e99eb359d7e001ddb /app/graphql | |
parent | 66ebf02c05dc69a65731d61baf28ef3335db2bbf (diff) |
Add latest changes from gitlab-org/security/gitlab@13-6-stable-ee
Diffstat (limited to 'app/graphql')
-rw-r--r-- | app/graphql/types/user_type.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/graphql/types/user_type.rb b/app/graphql/types/user_type.rb index 2bb2284f8b0..783a0d8425a 100644 --- a/app/graphql/types/user_type.rb +++ b/app/graphql/types/user_type.rb @@ -30,8 +30,7 @@ module Types resolver: Resolvers::TodoResolver, description: 'Todos of the user' field :group_memberships, Types::GroupMemberType.connection_type, null: true, - description: 'Group memberships of the user', - method: :group_members + description: 'Group memberships of the user' field :group_count, GraphQL::INT_TYPE, null: true, resolver: Resolvers::Users::GroupCountResolver, description: 'Group count for the user', @@ -39,8 +38,7 @@ module Types field :status, Types::UserStatusType, null: true, description: 'User status' field :project_memberships, Types::ProjectMemberType.connection_type, null: true, - description: 'Project memberships of the user', - method: :project_members + description: 'Project memberships of the user' field :starred_projects, Types::ProjectType.connection_type, null: true, description: 'Projects starred by the user', resolver: Resolvers::UserStarredProjectsResolver |