summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-12-04 16:49:26 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-12-04 16:49:26 +0000
commit66ebf02c05dc69a65731d61baf28ef3335db2bbf (patch)
treee82468af43b2fec9a4d841457d41d183b7a9d5e7 /app
parentd00f14d73f41129f9d986d4bec32f1f927b525a6 (diff)
downloadgitlab-ce-66ebf02c05dc69a65731d61baf28ef3335db2bbf.tar.gz
Add latest changes from gitlab-org/security/gitlab@13-6-stable-ee
Diffstat (limited to 'app')
-rw-r--r--app/graphql/types/user_type.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/graphql/types/user_type.rb b/app/graphql/types/user_type.rb
index 11c5369f726..2bb2284f8b0 100644
--- a/app/graphql/types/user_type.rb
+++ b/app/graphql/types/user_type.rb
@@ -19,7 +19,7 @@ module Types
field :state, Types::UserStateEnum, null: false,
description: 'State of the user'
field :email, GraphQL::STRING_TYPE, null: true,
- description: 'User email'
+ description: 'User email', method: :public_email
field :avatar_url, GraphQL::STRING_TYPE, null: true,
description: "URL of the user's avatar"
field :web_url, GraphQL::STRING_TYPE, null: false,